bazel build changes to separate trigger simulation code into its own "build module" (#16506)

This commit is contained in:
Carl Pulley 2023-03-14 19:13:06 +00:00 committed by GitHub
parent a8e9ee3937
commit ad2fb6353d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 56 additions and 2 deletions

View File

@ -83,6 +83,7 @@ EOF
da_scala_library( da_scala_library(
name = "test-utils", name = "test-utils",
srcs = [ srcs = [
"src/test/scala/com/digitalasset/daml/lf/engine/trigger/TriggerRuleSimulationLib.scala",
"src/test/scala/com/digitalasset/daml/lf/engine/trigger/test/AbstractFuncTests.scala", "src/test/scala/com/digitalasset/daml/lf/engine/trigger/test/AbstractFuncTests.scala",
"src/test/scala/com/digitalasset/daml/lf/engine/trigger/test/AbstractTriggerTest.scala", "src/test/scala/com/digitalasset/daml/lf/engine/trigger/test/AbstractTriggerTest.scala",
], ],
@ -102,6 +103,7 @@ da_scala_library(
"//daml-lf/interpreter", "//daml-lf/interpreter",
"//daml-lf/language", "//daml-lf/language",
"//daml-lf/transaction", "//daml-lf/transaction",
"//daml-script/converter",
"//language-support/scala/bindings", "//language-support/scala/bindings",
"//language-support/scala/bindings-akka", "//language-support/scala/bindings-akka",
"//ledger-api/rs-grpc-bridge", "//ledger-api/rs-grpc-bridge",
@ -113,9 +115,13 @@ da_scala_library(
"//ledger/participant-integration-api", "//ledger/participant-integration-api",
"//ledger/sandbox-on-x", "//ledger/sandbox-on-x",
"//ledger/sandbox-on-x:sandbox-on-x-test-lib", "//ledger/sandbox-on-x:sandbox-on-x-test-lib",
"//libs-scala/contextualized-logging",
"//libs-scala/ledger-resources", "//libs-scala/ledger-resources",
"//libs-scala/logging-entries",
"//libs-scala/ports", "//libs-scala/ports",
"//libs-scala/resources", "//libs-scala/resources",
"//libs-scala/scala-utils",
"//observability/tracing",
"//test-common", "//test-common",
"//triggers/runner:trigger-runner-lib", "//triggers/runner:trigger-runner-lib",
"@maven//:org_scalatest_scalatest_compatible", "@maven//:org_scalatest_scalatest_compatible",
@ -238,3 +244,53 @@ da_scala_library(
for lf_version in DAML_LF_VERSIONS for lf_version in DAML_LF_VERSIONS
for suffix in [("-" + lf_version) if lf_version else ""] for suffix in [("-" + lf_version) if lf_version else ""]
] ]
da_scala_test_suite(
name = "trigger-simulation-lib-tests",
srcs = glob(["src/test/scala/com/digitalasset/daml/lf/engine/trigger/*.scala"]),
data = [
":acs-1.dev.dar",
"//test-common/test-certificates",
],
resources = ["//triggers/runner:src/main/resources/logback.xml"],
scala_deps = [
"@maven//:com_typesafe_akka_akka_stream",
"@maven//:io_spray_spray_json",
"@maven//:org_scalacheck_scalacheck",
"@maven//:org_scalatestplus_scalacheck_1_15",
"@maven//:org_scalaz_scalaz_core",
],
deps = [
":test-utils",
"//bazel_tools/runfiles:scala_runfiles",
"//daml-lf/archive:daml_lf_archive_reader",
"//daml-lf/data",
"//daml-lf/engine",
"//daml-lf/interpreter",
"//daml-lf/language",
"//daml-script/converter",
"//language-support/scala/bindings",
"//language-support/scala/bindings-akka",
"//ledger-api/rs-grpc-bridge",
"//ledger-api/testing-utils",
"//ledger/caching",
"//ledger/ledger-api-auth",
"//ledger/ledger-api-common",
"//ledger/ledger-api-domain",
"//ledger/ledger-configuration",
"//ledger/ledger-runner-common",
"//ledger/participant-integration-api",
"//ledger/sandbox-on-x",
"//ledger/sandbox-on-x:sandbox-on-x-test-lib",
"//libs-scala/contextualized-logging",
"//libs-scala/ledger-resources",
"//libs-scala/logging-entries",
"//libs-scala/ports",
"//libs-scala/resources",
"//libs-scala/scala-utils",
"//libs-scala/scalatest-utils",
"//observability/tracing",
"//test-common",
"//triggers/runner:trigger-runner-lib",
],
)

View File

@ -777,8 +777,6 @@ final class TriggerRuleSimulationLib private (
val msgIn = gb add TriggerContextualFlow[SValue].map(ctx => val msgIn = gb add TriggerContextualFlow[SValue].map(ctx =>
ctx.copy(value = SList(FrontStack(ctx.value))) ctx.copy(value = SList(FrontStack(ctx.value)))
) )
val encodeMsg =
gb add runner.encodeMsgs.map(ctx => ctx.copy(value = SList(FrontStack(ctx.value))))
val stateOut = gb add Source.single(state) val stateOut = gb add Source.single(state)
val rule = gb add runner.runRuleOnMsgs(lambdaKillSwitch) val rule = gb add runner.runRuleOnMsgs(lambdaKillSwitch)
val killSwitch = gb add lambdaKillSwitch.flow[TriggerContext[SValue]] val killSwitch = gb add lambdaKillSwitch.flow[TriggerContext[SValue]]