Moved com.daml.platform.sandbox to com.daml.ledger.sandbox in SoX (#1…

…2675) * Moved com.daml.platform.sandbox to com.daml.ledger.sandbox in SoX changelog_begin changelog_end * Reordered imports
digital-asset · Jan 31, 2022 · 92938d5 · 92938d5
1 parent 8d5d3bd
commit 92938d5
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 15 deletions.
diff --git a/ledger/daml-on-sql/src/main/scala/on/sql/Main.scala b/ledger/daml-on-sql/src/main/scala/on/sql/Main.scala
@@ -4,10 +4,10 @@
 package com.daml.on.sql
 
 import java.util.concurrent.Executors
-import com.daml.ledger.resources.ResourceContext
 import com.daml.cliopts.GlobalLogLevel
+import com.daml.ledger.resources.ResourceContext
+import com.daml.ledger.sandbox.SandboxServer
 import com.daml.platform.sandbox.config.{PostgresStartupMode, SandboxConfig}
-import com.daml.platform.sandbox.SandboxServer
 import com.daml.resources.ProgramResource
 
 import scala.concurrent.ExecutionContext

diff --git a/ledger/participant-integration-api/src/main/scala/platform/store/FlywayMigrations.scala b/ledger/participant-integration-api/src/main/scala/platform/store/FlywayMigrations.scala
@@ -17,7 +17,7 @@ import scala.annotation.nowarn
 import scala.concurrent.duration.FiniteDuration
 import scala.concurrent.{ExecutionContext, Future}
 
-private[platform] class FlywayMigrations(
+private[daml] class FlywayMigrations(
     jdbcUrl: String,
     additionalMigrationPaths: Seq[String] = Seq.empty,
 )(implicit resourceContext: ResourceContext, loggingContext: LoggingContext) {

diff --git a/ledger/sandbox-classic/src/main/scala/com/daml/sandbox/SandboxMain.scala b/ledger/sandbox-classic/src/main/scala/com/daml/sandbox/SandboxMain.scala
@@ -5,7 +5,7 @@ package com.daml.sandbox
 
 import com.daml.cliopts.GlobalLogLevel
 import com.daml.ledger.resources.ResourceContext
-import com.daml.platform.sandbox.SandboxServer
+import com.daml.ledger.sandbox.SandboxServer
 import com.daml.platform.sandbox.config.LedgerName
 import com.daml.resources.ProgramResource
 

diff --git a/...ml/platform/sandbox/ConfigConverter.scala → ...aml/platform/ledger/ConfigConverter.scala b/...ml/platform/sandbox/ConfigConverter.scala → ...aml/platform/ledger/ConfigConverter.scala
@@ -1,11 +1,10 @@
 // Copyright (c) 2022 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package com.daml.platform.sandbox
+package com.daml.ledger.sandbox
 
 import com.daml.caching
 import com.daml.ledger.participant.state.kvutils.app._
-import com.daml.ledger.sandbox.{BridgeConfig, BridgeConfigProvider}
 import com.daml.lf.language.LanguageVersion
 import com.daml.platform.common.LedgerIdMode
 import com.daml.platform.sandbox.config.SandboxConfig.EngineMode
@@ -16,7 +15,7 @@ import scala.jdk.DurationConverters._
 object ConfigConverter {
   private val DefaultH2SandboxJdbcUrl = "jdbc:h2:mem:sandbox;db_close_delay=-1"
 
-  def toSandboxOnXConfig(
+  private[sandbox] def toSandboxOnXConfig(
       sandboxConfig: SandboxConfig,
       maybeLedgerId: Option[String],
       ledgerName: LedgerName,

diff --git a/.../platform/sandbox/LedgerIdGenerator.scala → ...l/platform/ledger/LedgerIdGenerator.scala b/.../platform/sandbox/LedgerIdGenerator.scala → ...l/platform/ledger/LedgerIdGenerator.scala
@@ -1,7 +1,7 @@
 // Copyright (c) 2022 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package com.daml.platform.sandbox
+package com.daml.ledger.sandbox
 
 import java.util.UUID
 

diff --git a/...daml/platform/sandbox/SandboxServer.scala → .../daml/platform/ledger/SandboxServer.scala b/...daml/platform/sandbox/SandboxServer.scala → .../daml/platform/ledger/SandboxServer.scala
@@ -1,7 +1,7 @@
 // Copyright (c) 2022 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package com.daml.platform.sandbox
+package com.daml.ledger.sandbox
 
 import akka.actor.ActorSystem
 import akka.stream.Materializer
@@ -11,16 +11,16 @@ import com.daml.ledger.participant.state.kvutils.app.Config
 import com.daml.ledger.participant.state.v2.WriteService
 import com.daml.ledger.resources
 import com.daml.ledger.resources.{Resource, ResourceContext, ResourceOwner}
-import com.daml.ledger.sandbox.{BridgeConfig, SandboxOnXRunner}
+import com.daml.ledger.sandbox.SandboxServer._
 import com.daml.lf.archive.DarParser
 import com.daml.lf.data.Ref
 import com.daml.logging.LoggingContext.{newLoggingContext, newLoggingContextWith}
 import com.daml.logging.{ContextualizedLogger, LoggingContext}
 import com.daml.metrics.{Metrics, MetricsReporting}
 import com.daml.platform.apiserver.ApiServer
-import com.daml.platform.sandbox.SandboxServer._
 import com.daml.platform.sandbox.banner.Banner
 import com.daml.platform.sandbox.config.{LedgerName, SandboxConfig}
+import com.daml.platform.sandbox.logging
 import com.daml.platform.server.api.validation.ErrorFactories
 import com.daml.platform.store.{FlywayMigrations, IndexMetadata}
 import com.daml.ports.Port
@@ -55,7 +55,7 @@ final class SandboxServer(
   )
 
   // Only used in testing; hopefully we can get rid of it soon.
-  private[sandbox] val port =
+  val port =
     Await.result(apiServerResource.asFuture.map(_.port)(ExecutionContext.parasitic), AsyncTolerance)
 
   override def close(): Unit = Await.result(apiServerResource.release(), AsyncTolerance)

diff --git a/ledger/sandbox-on-x/src/test/it/scala/com/daml/ledger/platform/sandbox/EngineModeIT.scala b/ledger/sandbox-on-x/src/test/it/scala/com/daml/ledger/platform/sandbox/EngineModeIT.scala
@@ -15,6 +15,7 @@ import com.daml.ledger.api.v1.command_service.SubmitAndWaitRequest
 import com.daml.ledger.api.v1.commands.{Command, Commands, CreateCommand}
 import com.daml.ledger.api.v1.value.{Identifier, Record, RecordField, Value}
 import com.daml.ledger.resources.TestResourceContext
+import com.daml.ledger.sandbox.SandboxServer
 import com.daml.lf.language.LanguageVersion
 import com.daml.platform.apiserver.SeedService.Seeding
 import com.daml.platform.apiserver.services.GrpcClientResource

diff --git a/...er/sandbox-on-x/src/test/lib/scala/com/daml/platform/sandbox/fixture/SandboxFixture.scala b/...er/sandbox-on-x/src/test/lib/scala/com/daml/platform/sandbox/fixture/SandboxFixture.scala
@@ -5,14 +5,15 @@ package com.daml.platform.sandbox.fixture
 
 import com.daml.ledger.api.testing.utils.{OwnedResource, Resource, SuiteResource}
 import com.daml.ledger.resources.{ResourceContext, ResourceOwner}
+import com.daml.ledger.sandbox.SandboxServer
 import com.daml.platform.apiserver.services.GrpcClientResource
 import com.daml.platform.sandbox.config.SandboxConfig
-import com.daml.platform.sandbox.{AbstractSandboxFixture, SandboxServer}
+import com.daml.platform.sandbox.AbstractSandboxFixture
 import com.daml.ports.Port
 import io.grpc.Channel
 import org.scalatest.Suite
-import scala.concurrent.duration._
 
+import scala.concurrent.duration._
 import java.time.Duration
 
 trait SandboxFixture extends AbstractSandboxFixture with SuiteResource[(SandboxServer, Channel)] {

diff --git a/...dbox-perf/src/perf/lib/scala/com/digitalasset/platform/sandbox/perf/LedgerFactories.scala b/...dbox-perf/src/perf/lib/scala/com/digitalasset/platform/sandbox/perf/LedgerFactories.scala
@@ -8,11 +8,11 @@ import java.util.concurrent.Executors
 import com.daml.ledger.api.domain.LedgerId
 import com.daml.ledger.api.testing.utils.{OwnedResource, Resource}
 import com.daml.ledger.resources.{ResourceContext, ResourceOwner}
+import com.daml.ledger.sandbox.SandboxServer
 import com.daml.lf.archive.UniversalArchiveReader
 import com.daml.lf.data.Ref
 import com.daml.platform.apiserver.services.GrpcClientResource
 import com.daml.platform.common.LedgerIdMode
-import com.daml.platform.sandbox.SandboxServer
 import com.daml.platform.sandbox.config.SandboxConfig
 import com.daml.platform.services.time.TimeProviderType.Static
 import com.daml.ports.Port