Fix compilation errors

Signed-off-by: Shota Jolbordi <[email protected]>

Author: Shota Jolbordi

build.sbt

@@ -50,7 +50,8 @@ lazy val versions = new {
   val typesafeConfig = "1.4.2"
   val fs2 = "3.2.5"
   val scalaUri = "4.0.0"
-  val prismSdk = "v1.4.1-snapshot-1688975371-7541fd2" // deployed to github packages from sdk branch "node-1.4-extension-sdk"
+  val prismSdk =
+    "v1.4.1-snapshot-1688975371-7541fd2" // deployed to github packages from sdk branch "node-1.4-extension-sdk"
   val vaultSdk = "0.1.0-build-2-96cc137d"
 }
 
@@ -108,9 +109,9 @@ lazy val Dependencies = new {
   // We have to exclude bouncycastle since for some reason bitcoinj depends on bouncycastle jdk15to18
   // (i.e. JDK 1.5 to 1.8), but we are using JDK 11
   val prismCredentials =
-  "io.iohk.atala" % "prism-credentials-jvm" % versions.prismSdk excludeAll ExclusionRule(
-    organization = "org.bouncycastle"
-  )
+    "io.iohk.atala" % "prism-credentials-jvm" % versions.prismSdk excludeAll ExclusionRule(
+      organization = "org.bouncycastle"
+    )
   val prismProtos =
     "io.iohk.atala" % "prism-protos-jvm" % versions.prismSdk % "protobuf-src" intransitive ()
   val vaultProtos =
@@ -190,7 +191,7 @@ lazy val commonSettings = Seq(
         "-Ywarn-dead-code"
       )
     )
-    ),
+  ),
   scalacOptions += "-Ymacro-annotations",
   javacOptions ++= Seq("-source", "1.11", "-target", "1.11"),
   githubTokenSource := TokenSource.Environment("GITHUB_TOKEN"),
@@ -243,43 +244,43 @@ lazy val commonSettings = Seq(
   }
 )
 
-lazy val common = project
-  .in(file("common"))
-  .settings(
-    commonSettings,
-    // Make ScalaPB compile protos relative to `protobuf_external_src/protos` directory.
-    // Otherwise, it will assume that `protobuf_external_src` is the root directory for proto files.
-    Compile / PB.protoSources := (Compile / PB.protoSources).value.map {
-      case externalSrc if externalSrc.toPath.endsWith("protobuf_external_src") =>
-        externalSrc / "proto"
-      case other => other
-    },
-    resolvers += Resolver.mavenLocal,
-    resolvers += Resolver.jcenterRepo,
-    resolvers += Resolver.mavenCentral,
-    libraryDependencies ++=
-      Dependencies.doobieDependencies ++
-        Dependencies.dockerDependencies ++
-        Dependencies.bouncyDependencies ++
-        Dependencies.grpcDependencies ++
-        Dependencies.mockitoDependencies ++
-        Dependencies.kamonDependencies ++
-        Dependencies.circeDependencies ++
-        Dependencies.enumeratumDependencies ++
-        Dependencies.tofuDependencies ++
-        Seq(
-          Dependencies.diffx,
-          Dependencies.flyway,
-          Dependencies.typesafeConfig,
-          Dependencies.fs2,
-          Dependencies.scalaUri
-        ) ++
-        Dependencies.prismDependencies ++
-        Dependencies.scalapbDependencies,
-    Compile / PB.targets := Seq(
-      scalapb.gen() -> (Compile / sourceManaged).value / "proto"
-    )
-  )
+//lazy val common = project
+//  .in(file("common"))
+//  .settings(
+//    commonSettings,
+//    // Make ScalaPB compile protos relative to `protobuf_external_src/protos` directory.
+//    // Otherwise, it will assume that `protobuf_external_src` is the root directory for proto files.
+//    Compile / PB.protoSources := (Compile / PB.protoSources).value.map {
+//      case externalSrc if externalSrc.toPath.endsWith("protobuf_external_src") =>
+//        externalSrc / "proto"
+//      case other => other
+//    },
+//    resolvers += Resolver.mavenLocal,
+//    resolvers += Resolver.jcenterRepo,
+//    resolvers += Resolver.mavenCentral,
+//    libraryDependencies ++=
+//      Dependencies.doobieDependencies ++
+//        Dependencies.dockerDependencies ++
+//        Dependencies.bouncyDependencies ++
+//        Dependencies.grpcDependencies ++
+//        Dependencies.mockitoDependencies ++
+//        Dependencies.kamonDependencies ++
+//        Dependencies.circeDependencies ++
+//        Dependencies.enumeratumDependencies ++
+//        Dependencies.tofuDependencies ++
+//        Seq(
+//          Dependencies.diffx,
+//          Dependencies.flyway,
+//          Dependencies.typesafeConfig,
+//          Dependencies.fs2,
+//          Dependencies.scalaUri
+//        ) ++
+//        Dependencies.prismDependencies ++
+//        Dependencies.scalapbDependencies,
+//    Compile / PB.targets := Seq(
+//      scalapb.gen() -> (Compile / sourceManaged).value / "proto"
+//    )
+//  )
 
 lazy val node =
   project
@@ -288,32 +289,58 @@ lazy val node =
       commonSettings,
       name := "node",
       Compile / mainClass := Some("io.iohk.atala.prism.node.NodeApp"),
+      // Make ScalaPB compile protos relative to `protobuf_external_src/protos` directory.
+      // Otherwise, it will assume that `protobuf_external_src` is the root directory for proto files.
+      Compile / PB.protoSources := (Compile / PB.protoSources).value.map {
+        case externalSrc if externalSrc.toPath.endsWith("protobuf_external_src") =>
+          externalSrc / "proto"
+        case other => other
+      },
+      Compile / PB.targets := Seq(
+        scalapb.gen() -> (Compile / sourceManaged).value / "proto"
+      ),
+      resolvers += Resolver.mavenLocal,
+      resolvers += Resolver.jcenterRepo,
+      resolvers += Resolver.mavenCentral,
       Docker / maintainer := "[email protected]",
       Docker / dockerUsername := Some("input-output-hk"),
       Docker / dockerRepository := Some("ghcr.io"),
       Docker / packageName := "prism-node",
       dockerExposedPorts := Seq(5432),
       dockerBaseImage := "openjdk:11",
-      libraryDependencies ++= Dependencies.circeDependencies ++ Dependencies.enumeratumDependencies ++ Dependencies.doobieDependencies ++
-        Dependencies.grpcDependencies ++ Dependencies.logbackDependencies ++
-        Dependencies.sttpDependencies ++
-        Dependencies.prismDependencies ++
-        Dependencies.mockitoDependencies ++
-        Seq(
-          Dependencies.chimney,
-          Dependencies.flyway,
-          Dependencies.postgresql,
-          Dependencies.scalapbRuntimeGrpc,
-          Dependencies.slf4j,
-          Dependencies.typesafeConfig
-        )
+      libraryDependencies
+        ++= Dependencies.circeDependencies
+          ++ Dependencies.tofuDependencies
+          ++ Dependencies.kamonDependencies
+          ++ Dependencies.dockerDependencies
+          ++ Dependencies.bouncyDependencies
+          ++ Dependencies.enumeratumDependencies
+          ++ Dependencies.doobieDependencies
+          ++ Dependencies.grpcDependencies
+          ++ Dependencies.logbackDependencies
+          ++ Dependencies.sttpDependencies
+          ++ Dependencies.prismDependencies
+          ++ Dependencies.mockitoDependencies
+          ++ Dependencies.prismDependencies
+          ++ Dependencies.scalapbDependencies
+          ++ Seq(
+            Dependencies.chimney,
+            Dependencies.diffx,
+            Dependencies.flyway,
+            Dependencies.typesafeConfig,
+            Dependencies.postgresql,
+            Dependencies.scalapbRuntimeGrpc,
+            Dependencies.slf4j,
+            Dependencies.typesafeConfig,
+            Dependencies.fs2,
+            Dependencies.scalaUri
+          )
     )
     .enablePlugins(BuildInfoPlugin, JavaAppPackaging, DockerPlugin)
-    .dependsOn(common % "compile->compile;test->test")
 
 lazy val root = project
   .in(file("."))
-  .aggregate(common, node)
+  .aggregate(node)
 
 Global / onChangedBuildSource := ReloadOnSourceChanges
 

common/src/main/protobuf/endorsements_api.proto

@@ -6,18 +6,18 @@ import cats.implicits.toFunctorOps
 import com.typesafe.config.{Config, ConfigFactory}
 import doobie.hikari.HikariTransactor
 import io.grpc.{Server, ServerBuilder}
-import io.iohk.atala.prism.auth.WhitelistedAuthenticatorF
-import io.iohk.atala.prism.auth.grpc.{
+import io.iohk.atala.prism.node.auth.WhitelistedAuthenticatorF
+import io.iohk.atala.prism.node.auth.grpc.{
   GrpcAuthenticatorInterceptor,
   TraceExposeInterceptor,
   TraceReadInterceptor
 }
-import io.iohk.atala.prism.auth.utils.DidWhitelistLoader
+import io.iohk.atala.prism.node.auth.utils.DidWhitelistLoader
 import io.iohk.atala.prism.identity.PrismDid
-import io.iohk.atala.prism.logging.TraceId
-import io.iohk.atala.prism.logging.TraceId.IOWithTraceIdContext
-import io.iohk.atala.prism.metrics.UptimeReporter
-import io.iohk.atala.prism.models.DidSuffix
+import io.iohk.atala.prism.node.logging.TraceId
+import io.iohk.atala.prism.node.logging.TraceId.IOWithTraceIdContext
+import io.iohk.atala.prism.node.metrics.UptimeReporter
+import io.iohk.atala.prism.node.models.DidSuffix
 import io.iohk.atala.prism.node.cardano.CardanoClient
 import io.iohk.atala.prism.node.metrics.NodeReporter
 import io.iohk.atala.prism.node.operations.ApplyOperationConfig
@@ -26,8 +26,8 @@ import io.iohk.atala.prism.node.services.CardanoLedgerService.CardanoBlockHandle
 import io.iohk.atala.prism.node.services._
 import io.iohk.atala.prism.node.services.models.AtalaObjectNotification
 import io.iohk.atala.prism.protos.node_api._
-import io.iohk.atala.prism.repositories.{SchemaMigrations, TransactorFactory}
-import io.iohk.atala.prism.utils.IOUtils._
+import io.iohk.atala.prism.node.repositories.{SchemaMigrations, TransactorFactory}
+import io.iohk.atala.prism.node.utils.IOUtils._
 import kamon.Kamon
 import kamon.module.Module
 import org.slf4j.LoggerFactory

common/src/test/resources/application.conf

@@ -7,7 +7,7 @@ import io.iohk.atala.prism.node.cardano.dbsync.CardanoDbSyncClient
 import io.iohk.atala.prism.node.cardano.wallet.CardanoWalletApiClient
 import io.iohk.atala.prism.node.services.CardanoLedgerService
 import io.iohk.atala.prism.node.services.CardanoLedgerService.CardanoNetwork
-import io.iohk.atala.prism.repositories.TransactorFactory
+import io.iohk.atala.prism.node.repositories.TransactorFactory
 import sttp.model.Header
 
 import scala.util.Try

common/src/test/resources/common/db/migration/V1__create_connector_message_offset.sql

@@ -1,8 +1,8 @@
 package io.iohk.atala.prism.node
 
-import io.iohk.atala.prism.auth.{WhitelistedAuthHelper, model}
+import io.iohk.atala.prism.node.auth.{WhitelistedAuthHelper, model}
 import io.iohk.atala.prism.identity.PrismDid
-import io.iohk.atala.prism.logging.TraceId.IOWithTraceIdContext
+import io.iohk.atala.prism.node.logging.TraceId.IOWithTraceIdContext
 import io.iohk.atala.prism.node.repositories.RequestNoncesRepository
 
 class NodeExplorerAuthenticator(

common/src/test/resources/common/db/migration/V2__create_config.sql

@@ -3,14 +3,14 @@ package io.iohk.atala.prism.node
 import cats.effect.unsafe.IORuntime
 import cats.syntax.traverse._
 import com.google.protobuf.ByteString
-import io.iohk.atala.prism.auth.WhitelistedAuthenticatorF
-import io.iohk.atala.prism.auth.grpc.GrpcAuthenticationHeaderParser.grpcHeader
+import io.iohk.atala.prism.node.auth.WhitelistedAuthenticatorF
+import io.iohk.atala.prism.node.auth.grpc.GrpcAuthenticationHeaderParser.grpcHeader
 import io.iohk.atala.prism.identity.{PrismDid => DID}
-import io.iohk.atala.prism.logging.TraceId
-import io.iohk.atala.prism.logging.TraceId.IOWithTraceIdContext
-import io.iohk.atala.prism.metrics.RequestMeasureUtil
-import io.iohk.atala.prism.metrics.RequestMeasureUtil.measureRequestFuture
-import io.iohk.atala.prism.models.TransactionId
+import io.iohk.atala.prism.node.logging.TraceId
+import io.iohk.atala.prism.node.logging.TraceId.IOWithTraceIdContext
+import io.iohk.atala.prism.node.metrics.RequestMeasureUtil
+import io.iohk.atala.prism.node.metrics.RequestMeasureUtil.measureRequestFuture
+import io.iohk.atala.prism.node.models.TransactionId
 import io.iohk.atala.prism.node.NodeExplorerGrpcServiceImpl.{countAndThrowNodeError, serviceName}
 import io.iohk.atala.prism.node.errors.NodeError
 import io.iohk.atala.prism.node.metrics.StatisticsCounters
@@ -25,8 +25,8 @@ import io.iohk.atala.prism.protos.node_api.GetScheduledOperationsRequest.Operati
   UpdateDidOperationOperationType
 }
 import io.iohk.atala.prism.protos.node_api._
-import io.iohk.atala.prism.tracing.Tracing.trace
-import io.iohk.atala.prism.utils.FutureEither.FutureEitherOps
+import io.iohk.atala.prism.node.tracing.Tracing.trace
+import io.iohk.atala.prism.node.utils.FutureEither.FutureEitherOps
 import scalapb.GeneratedMessage
 
 import scala.concurrent.{ExecutionContext, Future}