Participant-side deduplication compatibility tests exclusions

digital-asset · Jan 27, 2022 · 6030225 · 6030225
1 parent d8af4c2
commit 6030225
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/compatibility/bazel_tools/testing.bzl b/compatibility/bazel_tools/testing.bzl
@@ -715,6 +715,19 @@ excluded_test_tool_tests = [
             },
         ],
     },
+    {
+        # Sandbox-on-X doesn't use participant-side command deduplication starting with next release,
+        # hence older tests will fail to assert it.
+        "end": "2.0.0-snapshot.20220126.9029.1",
+        "platform_ranges": [
+            {
+                "start": "2.0.0-snapshot.20220126.9029.1",
+                "exclusions": [
+                    "CommandDeduplicationIT:ParticipantCommandDeduplication",
+                ],
+            },
+        ],
+    },
 ]
 
 def in_range(version, range):

diff --git a/...er/sandbox-on-x/src/main/scala/com/daml/ledger/sandbox/bridge/validate/SequenceImpl.scala b/...er/sandbox-on-x/src/main/scala/com/daml/ledger/sandbox/bridge/validate/SequenceImpl.scala
@@ -91,7 +91,6 @@ private[validate] class SequenceImpl(
     case s: Submission.UploadPackages =>
       Some(packageUploadSuccess(s, timeProvider.getCurrentTimestamp))
     case _: Submission.Transaction =>
-      // TODO SoX: Handle gracefully
       throw new RuntimeException("Unexpected Submission.Transaction")
   }
 
@@ -156,11 +155,15 @@ private[validate] class SequenceImpl(
 
     withErrorLogger(submitterInfo.submissionId) { implicit errorLogger =>
       for {
-        _ <- checkTimeModel(txSubmission.submission, recordTime, ledgerConfiguration)
+        _ <- checkTimeModel(
+          transaction = txSubmission.submission,
+          recordTime = recordTime,
+          ledgerConfiguration = ledgerConfiguration,
+        )
         _ <- validateParties(
-          allocatedParties,
-          txSubmission.transactionInformees,
-          completionInfo,
+          allocatedParties = allocatedParties,
+          transactionInformees = txSubmission.transactionInformees,
+          completionInfo = completionInfo,
         )
         _ <- conflictCheckWithInFlight(
           keysState = sequencerState.keyState,
@@ -169,7 +172,7 @@ private[validate] class SequenceImpl(
           inputContracts = txSubmission.inputContracts,
           completionInfo = completionInfo,
         )
-        _ <- deduplicate(
+        _ <- deduplicateAndUpdateState(
           changeId = ChangeId(
             submitterInfo.applicationId,
             submitterInfo.commandId,
@@ -237,7 +240,7 @@ private[validate] class SequenceImpl(
           }
     }
 
-  private def deduplicate(
+  private def deduplicateAndUpdateState(
       changeId: ChangeId,
       deduplicationPeriod: DeduplicationPeriod,
       completionInfo: CompletionInfo,

diff --git a/...dbox-on-x/src/test/suite/scala/com/daml/ledger/sandbox/bridge/validate/SequenceSpec.scala b/...dbox-on-x/src/test/suite/scala/com/daml/ledger/sandbox/bridge/validate/SequenceSpec.scala
@@ -416,6 +416,7 @@ class SequenceSpec extends AnyFlatSpec with MockitoSugar with Matchers with Argu
       initialAllocatedParties = allocatedInformees,
       initialLedgerConfiguration = initialLedgerConfiguration,
       maxDeduplicationDuration = maxDeduplicationDuration,
+      wallClockTime = () => timeProviderMock.getCurrentTimestamp,
     )
 
     def exerciseNonConsuming(