Switch daml-lf/engine and leger-api-tests/tool not depend on kvutils (#13107)

changelog_begin
changelog_end
This commit is contained in:
tudor-da 2022-03-01 15:41:12 +01:00 committed by GitHub
parent 6da1cde1b3
commit ea48173350
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions

View File

@ -141,11 +141,10 @@ da_scala_test(
"//ledger/ledger-api-auth",
"//ledger/ledger-api-client",
"//ledger/ledger-api-common",
"//ledger/ledger-on-memory",
"//ledger/ledger-on-memory:ledger-on-memory-app",
"//ledger/ledger-resources",
"//ledger/ledger-runner-common",
"//ledger/participant-integration-api",
"//ledger/sandbox-on-x",
"//ledger/test-common:dar-files-1.14-lib",
"//libs-scala/ports",
"//libs-scala/resources",

View File

@ -29,8 +29,8 @@ import com.daml.ledger.runner.common.{
ParticipantIndexerConfig,
ParticipantRunMode,
}
import com.daml.ledger.on.memory.Owner
import com.daml.ledger.resources.ResourceContext
import com.daml.ledger.sandbox.{BridgeConfig, BridgeConfigProvider, SandboxOnXRunner}
import com.daml.ledger.test.ModelTestDar
import com.daml.lf.VersionRange
import com.daml.lf.archive.DarDecoder
@ -144,9 +144,9 @@ final class MinVersionTest
implicit val resourceContext: ResourceContext = ResourceContext(system.dispatcher)
new OwnedResource[ResourceContext, Port](
for {
_ <- Owner(
_ <- SandboxOnXRunner.owner(
Config
.createDefault(())
.createDefault[BridgeConfig](BridgeConfigProvider.defaultExtraConfig)
.copy(
participants = Seq(participant),
// Bump min version to 1.14 and check that older stable packages are still accepted.

View File

@ -92,7 +92,7 @@ conformance_test(
],
lf_versions = lf_version_configuration_versions,
ports = [6865],
server = "//ledger/ledger-on-sql:test-server-postgresql-bin",
server = "//ledger/sandbox-on-x:conformance-test-postgres-bin",
server_args = [
"--contract-id-seeding=testing-weak",
"--participant=participant-id=example,port=6865",
@ -123,7 +123,7 @@ conformance_test(
],
lf_versions = lf_version_configuration_versions,
ports = [6865],
server = "//ledger/ledger-on-sql:test-server-postgresql-bin",
server = "//ledger/sandbox-on-x:conformance-test-postgres-bin",
server_args = [
"--contract-id-seeding=testing-weak",
"--participant=participant-id=example,port=6865",

View File

@ -269,6 +269,7 @@ da_scala_library(
deps = [
":sandbox-on-x",
"//ledger/ledger-resources",
"//ledger/ledger-runner-common",
"//libs-scala/contextualized-logging",
"//libs-scala/resources",
],

View File

@ -63,7 +63,7 @@ object SandboxOnXRunner {
.map(manipulateConfig)
.flatMap(owner)
private def owner(originalConfig: Config[BridgeConfig]): ResourceOwner[Unit] =
def owner(originalConfig: Config[BridgeConfig]): ResourceOwner[Unit] =
new ResourceOwner[Unit] {
override def acquire()(implicit context: ResourceContext): Resource[Unit] = {
val config = BridgeConfigProvider.manipulateConfig(originalConfig)