ledger-api-test-tool: Add static time awareness [KVL-1156] #11266

nicu-da · 2021-10-15T15:25:22Z

Add command-line argument --static-time which makes the test tool aware that the ledger is running in static time

For command deduplication conformance tests this allows us to forward the time so that the tests can run in static time mode as well

CHANGELOG_BEGIN
CHANGELOG_END

Pull Request Checklist

Read and understand the contribution guidelines
Include appropriate tests
Set a descriptive title and thorough description
Add a reference to the issue this PR will solve, if appropriate
Include changelog additions in one or more commit message bodies between the CHANGELOG_BEGIN and CHANGELOG_END tags
Normal production system change, include purpose of change in description
If you mean to change the status of a component, please make sure you keep the Component Status page up to date.

NOTE: CI is not automatically run on non-members pull-requests for security
reasons. The reviewer will have to comment with /AzurePipelines run to
trigger the build.

…akes the test tool aware that the ledger is running in static time For command deduplication conformance tests this allows us to forward the time so that the tests can run in static time mode as well CHANGELOG_BEGIN CHANGELOG_END

ledger/ledger-api-test-tool/src/main/scala/com/daml/ledger/api/testtool/Cli.scala

ledger/sandbox/BUILD.bazel

…/testtool/Cli.scala Co-authored-by: Samir Talwar <[email protected]>

fabiotudone-da · 2021-10-18T07:35:50Z

...ala/com/daml/ledger/api/testtool/infrastructure/deduplication/CommandDeduplicationBase.scala

@@ -40,9 +40,9 @@ private[testtool] abstract class CommandDeduplicationBase(

  def deduplicationFeatures: DeduplicationFeatures

-  protected def runGivenDeduplicationWait(
+  protected def runWithDelay(


Suggested change

protected def runWithDelay(

protected def runWithDeduplicationDelay(

fabiotudone-da · 2021-10-18T07:36:47Z

...ala/com/daml/ledger/api/testtool/infrastructure/deduplication/CommandDeduplicationBase.scala

      participants: Seq[ParticipantTestContext]
-  )(test: Duration => Future[Unit])(implicit
+  )(test: (() => Future[Unit]) => Future[Unit])(implicit


Suggested change

)(test: (() => Future[Unit]) => Future[Unit])(implicit

)(testGivenDelayer: (() => Future[Unit]) => Future[Unit])(implicit

fabiotudone-da · 2021-10-18T07:37:51Z

...ala/com/daml/ledger/api/testtool/infrastructure/deduplication/CommandDeduplicationBase.scala

-  // Without the submission id we cannot assert the received completions for parallel submissions
-  if (deduplicationFeatures.appendOnlySchema)
+  // appendOnlySchema - without the submission id we cannot assert the received completions for parallel submissions
+  // staticTime - we run calls in parallel and with static time we advance the time, therefore this cannot be run in static time


Suggested change

// staticTime - we run calls in parallel and with static time we advance the time, therefore this cannot be run in static time

// staticTime - we run calls in parallel and with static time we'd need to advance the time, therefore this cannot be run in static time

fabiotudone-da · 2021-10-18T08:34:00Z

...a/com/daml/ledger/api/testtool/infrastructure/deduplication/KVCommandDeduplicationBase.scala

@@ -98,14 +99,39 @@ abstract class KVCommandDeduplicationBase(
    }
  )

-  protected override def runGivenDeduplicationWait(
+  protected override def runWithDelay(


Suggested change

protected override def runWithDelay(

protected override def runWithDeduplicationDelay(

fabiotudone-da · 2021-10-18T08:34:32Z

...a/com/daml/ledger/api/testtool/infrastructure/deduplication/KVCommandDeduplicationBase.scala

      participants: Seq[ParticipantTestContext]
-  )(test: Duration => Future[Unit])(implicit ec: ExecutionContext): Future[Unit] = {
+  )(test: (() => Future[Unit]) => Future[Unit])(implicit ec: ExecutionContext): Future[Unit] = {


Suggested change

)(test: (() => Future[Unit]) => Future[Unit])(implicit ec: ExecutionContext): Future[Unit] = {

)(testGivenDelayer: (() => Future[Unit]) => Future[Unit])(implicit ec: ExecutionContext): Future[Unit] = {

fabiotudone-da · 2021-10-18T08:35:26Z

...a/com/daml/ledger/api/testtool/infrastructure/deduplication/KVCommandDeduplicationBase.scala

+  ) = {
+    ledger
+      .time()
+      .flatMap(currentTime => {
+        ledger.setTime(currentTime, currentTime.plusMillis(duration.toMillis))
+      })
+  }


Suggested change

) = {

ledger

.time()

.flatMap(currentTime => {

ledger.setTime(currentTime, currentTime.plusMillis(duration.toMillis))

})

}

) = ledger

.time()

.flatMap(currentTime => {

ledger.setTime(currentTime, currentTime.plusMillis(duration.toMillis))

})

fabiotudone-da · 2021-10-18T08:36:31Z

...pi-test-tool/src/main/scala/com/daml/ledger/api/testtool/suites/CommandDeduplicationIT.scala


-  override def runGivenDeduplicationWait(
+  override def runWithDelay(


Suggested change

override def runWithDelay(

override def runWithDeduplicationDelay(

fabiotudone-da · 2021-10-18T08:36:56Z

...pi-test-tool/src/main/scala/com/daml/ledger/api/testtool/suites/CommandDeduplicationIT.scala

      participants: Seq[ParticipantTestContext]
-  )(test: Duration => Future[Unit])(implicit ec: ExecutionContext): Future[Unit] = {
-    test(defaultDeduplicationWindowWait)
+  )(test: (() => Future[Unit]) => Future[Unit])(implicit


Suggested change

)(test: (() => Future[Unit]) => Future[Unit])(implicit

)(testGivenDelayer: (() => Future[Unit]) => Future[Unit])(implicit

fabiotudone-da · 2021-10-18T08:37:15Z

...pi-test-tool/src/main/scala/com/daml/ledger/api/testtool/suites/CommandDeduplicationIT.scala

+  ): Future[Unit] = {
+    test(() => Delayed.by(defaultDeduplicationWindowWait)(()))
  }


Suggested change

): Future[Unit] = {

test(() => Delayed.by(defaultDeduplicationWindowWait)(()))

}

): Future[Unit] =

test(() => Delayed.by(defaultDeduplicationWindowWait)(()))

ghost · 2021-10-18T08:43:16Z

@nicu-da is out for a week so I will address your comments, @fabiotudone-da.

fabiotudone-da · 2021-10-18T08:49:49Z

@nicu-da is out for a week so I will address your comments, @fabiotudone-da.

@SamirTalwar-DA Sure if you want but no need to do it now, they are minor so we can merge as-is.

Co-authored-by: Fabio Tudone <[email protected]>

@sofiafaro-da

This PR has been created by a script, which is not very smart and does not have all the context. Please do double-check that the version prefix is correct before merging. @sofiafaro-da is in charge of this release. Commit log: ``` 8ff347d Expand type synonyms lazily (#11282) 2fd200f KV: support contextual logging in KeyValueConsumption [KVL-1143] (#11288) f4df1cc converting server errors to proper client errors (#11184) 525e4ce Add GrpcStatus.toProto(JavaStatus) -> ScalaStatus conversion [KVL-1143] (#11292) 9b00a1a Rotate release rotation (#11291) dd09c38 Upgrade rules-nodejs (#11290) 87f1418 [Short] Remove unnecessary traits from ApiSubmissionServiceSpec (#11254) 6b65a72 Merge npm install steps in create-daml-app tests (#11287) a9f6afb kvutils: Rename `VersionedOffset` to `KVOffset`. (#11286) 98cf8d8 KV: introduce v2 error codes behind a CLI switch [KVL-1140] (#11224) 46f6877 Increase time model skew limits (#11273) 8f94cff kvutils: Use `VersionedOffsetBuilder` where possible, and introduce `VersionedOffsetMutator`. [KVL-1154] (#11277) 81fde97 Bazel: Call `_wrap_rule` directly when building the Scala REPL rule. (#11279) edb2b04 Document scaladoc usage in Bazel (#11278) 6255837 Data dependencies support for reexports (#11147) 2fc7490 [Self-service error codes] Adapt error factories [DPP-656] (#11270) b1a6b11 ledger-api-test-tool: Add static time awareness [KVL-1156] (#11266) 243c120 Add an LF typechecking benchmark (#11276) 2db8c13 Test authorization within Exercise choice. (#11246) ec58ed6 Typecheck nested LF type applications more efficiently (#11253) a940016 Add debugRaw corresponding to traceM in Haskell (#11259) a988579 Fix Scala repl targets (#11272) e4808f6 Extract UtilLF module from daml-lf-conversion to its own library (#11263) 38712c0 sandbox-next - Disable participant command deduplication [KVL-1156] (#11264) 82fa229 Add daml-util-ghc lib (#11260) 68a93cf kvutils - Use the ledger configured time for command dedup [KVL-1149] (#11239) c8cede0 Bump startup time in create-daml-app tests (#11261) 4fac87f Bump the schema version for the JSON API (#11252) 5507670 update NOTICES file (#11256) 0063b10 Retry faster during startup (#11255) 04feb40 Improve reset service tests (#11240) b3375fd update compat versions for 1.18.0-snapshot.20211013.8071.0.514e8b50 (#11237) 9ed1eb3 Address security notice on `ansi-regex` (#11243) 387d0e8 Make compatibility migrations `eternal` (#11242) be899b3 Extract rejection_reason.proto from daml_kvutils.proto [KVL-1090] (#11235) a1d94e1 LF: Create special case class for VersionedContractInstance (#11127) b738988 Release 1.18 snapshot (#11234) 3c26852 LF: Use template Id in exercise node of fixed choice. (#11229) 139b6f3 CI: Set `PROJ_DIR` inside the bash lib, not outside. (#11236) ce64cb2 interfaces: Do some TODOs (#11231) 7a88c7d trigger-service: dev-mode-unsafe flag (#11233) 909a1bf [DPP-417][DDP-612] Adapt ApiSubmissionService to support V2 error codes (#11052) ``` Changelog: ``` - [JSON API] Several kinds of gRPC server errors are now reported with associated HTTP statuses; for example, a Daml-LF interpreter error now returns a 400 instead of a 500, and an exercise on an archived contract returns a 409 Conflict instead of a 500. Errors internal to JSON API (e.g. internal assertion failures) are no longer detailed in the HTTP response; their details are only logged. See `issue #11184 <https://github.com/digital-asset/daml/pull/11184>`__. - [Daml Stdlib] Add `debugRaw` as a convenience wrapper around `traceRaw` when used inside a do-block. `debugRaw` compares to `debug` like `traceRaw` compares to `trace` meaning it expects a `Text` instead of calling `show` on an expression. sandbox-next - Disable participant command deduplication kvutils - Command deduplication uses the configured time model (static/wall) and not running always using wall-clock [JSON API] Solving a bug that could cause the JSON API to return correct result if a contract with the same key is observed twice required a schema change. The JSON API data needs to be dropped and the query store needs to reset. If you are migrating from a previous version, either reset your database manually or start the HTTP JSON API with one of the options that regenerate the schema (`create-only`, `create-if-needed-and-start`, `create-and-start`). ``` CHANGELOG_BEGIN CHANGELOG_END

@sofiafaro-da

This PR has been created by a script, which is not very smart and does not have all the context. Please do double-check that the version prefix is correct before merging. @sofiafaro-da is in charge of this release. Commit log: ``` 8ff347d Expand type synonyms lazily (#11282) 2fd200f KV: support contextual logging in KeyValueConsumption [KVL-1143] (#11288) f4df1cc converting server errors to proper client errors (#11184) 525e4ce Add GrpcStatus.toProto(JavaStatus) -> ScalaStatus conversion [KVL-1143] (#11292) 9b00a1a Rotate release rotation (#11291) dd09c38 Upgrade rules-nodejs (#11290) 87f1418 [Short] Remove unnecessary traits from ApiSubmissionServiceSpec (#11254) 6b65a72 Merge npm install steps in create-daml-app tests (#11287) a9f6afb kvutils: Rename `VersionedOffset` to `KVOffset`. (#11286) 98cf8d8 KV: introduce v2 error codes behind a CLI switch [KVL-1140] (#11224) 46f6877 Increase time model skew limits (#11273) 8f94cff kvutils: Use `VersionedOffsetBuilder` where possible, and introduce `VersionedOffsetMutator`. [KVL-1154] (#11277) 81fde97 Bazel: Call `_wrap_rule` directly when building the Scala REPL rule. (#11279) edb2b04 Document scaladoc usage in Bazel (#11278) 6255837 Data dependencies support for reexports (#11147) 2fc7490 [Self-service error codes] Adapt error factories [DPP-656] (#11270) b1a6b11 ledger-api-test-tool: Add static time awareness [KVL-1156] (#11266) 243c120 Add an LF typechecking benchmark (#11276) 2db8c13 Test authorization within Exercise choice. (#11246) ec58ed6 Typecheck nested LF type applications more efficiently (#11253) a940016 Add debugRaw corresponding to traceM in Haskell (#11259) a988579 Fix Scala repl targets (#11272) e4808f6 Extract UtilLF module from daml-lf-conversion to its own library (#11263) 38712c0 sandbox-next - Disable participant command deduplication [KVL-1156] (#11264) 82fa229 Add daml-util-ghc lib (#11260) 68a93cf kvutils - Use the ledger configured time for command dedup [KVL-1149] (#11239) c8cede0 Bump startup time in create-daml-app tests (#11261) 4fac87f Bump the schema version for the JSON API (#11252) 5507670 update NOTICES file (#11256) 0063b10 Retry faster during startup (#11255) 04feb40 Improve reset service tests (#11240) b3375fd update compat versions for 1.18.0-snapshot.20211013.8071.0.514e8b50 (#11237) 9ed1eb3 Address security notice on `ansi-regex` (#11243) 387d0e8 Make compatibility migrations `eternal` (#11242) be899b3 Extract rejection_reason.proto from daml_kvutils.proto [KVL-1090] (#11235) a1d94e1 LF: Create special case class for VersionedContractInstance (#11127) b738988 Release 1.18 snapshot (#11234) 3c26852 LF: Use template Id in exercise node of fixed choice. (#11229) 139b6f3 CI: Set `PROJ_DIR` inside the bash lib, not outside. (#11236) ce64cb2 interfaces: Do some TODOs (#11231) 7a88c7d trigger-service: dev-mode-unsafe flag (#11233) 909a1bf [DPP-417][DDP-612] Adapt ApiSubmissionService to support V2 error codes (#11052) ``` Changelog: ``` - [JSON API] Several kinds of gRPC server errors are now reported with associated HTTP statuses; for example, a Daml-LF interpreter error now returns a 400 instead of a 500, and an exercise on an archived contract returns a 409 Conflict instead of a 500. Errors internal to JSON API (e.g. internal assertion failures) are no longer detailed in the HTTP response; their details are only logged. See `issue #11184 <https://github.com/digital-asset/daml/pull/11184>`__. - [Daml Stdlib] Add `debugRaw` as a convenience wrapper around `traceRaw` when used inside a do-block. `debugRaw` compares to `debug` like `traceRaw` compares to `trace` meaning it expects a `Text` instead of calling `show` on an expression. sandbox-next - Disable participant command deduplication kvutils - Command deduplication uses the configured time model (static/wall) and not running always using wall-clock [JSON API] Solving a bug that could cause the JSON API to return correct result if a contract with the same key is observed twice required a schema change. The JSON API data needs to be dropped and the query store needs to reset. If you are migrating from a previous version, either reset your database manually or start the HTTP JSON API with one of the options that regenerate the schema (`create-only`, `create-if-needed-and-start`, `create-and-start`). ``` CHANGELOG_BEGIN CHANGELOG_END Co-authored-by: Azure Pipelines Daml Build <[email protected]>

nicu-da requested review from a team as code owners October 15, 2021 15:25

ghost reviewed Oct 15, 2021

View reviewed changes

nicu-da and others added 3 commits October 15, 2021 09:08

Update ledger/ledger-api-test-tool/src/main/scala/com/daml/ledger/api…

12f1fee

…/testtool/Cli.scala Co-authored-by: Samir Talwar <[email protected]>

Do not run conformance test that cannot run in static time

2ad219e

Remove hidden from static time flag for ledger api test tool

55f8057

nicu-da requested a review from a user October 15, 2021 16:16

ghost approved these changes Oct 18, 2021

View reviewed changes

fabiotudone-da approved these changes Oct 18, 2021

View reviewed changes

hubert-da approved these changes Oct 18, 2021

View reviewed changes

ledger-api-test-tool: Clarify parts of the deduplication tests.

970f494

Co-authored-by: Fabio Tudone <[email protected]>

ghost enabled auto-merge (squash) October 18, 2021 14:05

ghost merged commit b1a6b11 into main Oct 18, 2021

ghost deleted the nicuda/kvl-1156/static_time_command_dedup_conformance branch October 18, 2021 14:16

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ledger-api-test-tool: Add static time awareness [KVL-1156] #11266

ledger-api-test-tool: Add static time awareness [KVL-1156] #11266

nicu-da commented Oct 15, 2021

fabiotudone-da Oct 18, 2021

fabiotudone-da Oct 18, 2021

fabiotudone-da Oct 18, 2021

fabiotudone-da Oct 18, 2021

fabiotudone-da Oct 18, 2021

fabiotudone-da Oct 18, 2021

fabiotudone-da Oct 18, 2021

fabiotudone-da Oct 18, 2021

fabiotudone-da Oct 18, 2021

ghost commented Oct 18, 2021

fabiotudone-da commented Oct 18, 2021

	protected def runWithDelay(
	protected def runWithDeduplicationDelay(

	)(test: (() => Future[Unit]) => Future[Unit])(implicit
	)(testGivenDelayer: (() => Future[Unit]) => Future[Unit])(implicit

	// staticTime - we run calls in parallel and with static time we advance the time, therefore this cannot be run in static time
	// staticTime - we run calls in parallel and with static time we'd need to advance the time, therefore this cannot be run in static time

	protected override def runWithDelay(
	protected override def runWithDeduplicationDelay(


		override def runGivenDeduplicationWait(
		override def runWithDelay(

	override def runWithDelay(
	override def runWithDeduplicationDelay(

ledger-api-test-tool: Add static time awareness [KVL-1156] #11266

ledger-api-test-tool: Add static time awareness [KVL-1156] #11266

Conversation

nicu-da commented Oct 15, 2021

Pull Request Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost commented Oct 18, 2021

fabiotudone-da commented Oct 18, 2021