Addressed review comments

digital-asset · Aug 31, 2021 · 355dadd · 355dadd
1 parent 02c7db5
commit 355dadd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/ledger/ledger-api-test-tool-on-canton/BUILD.bazel b/ledger/ledger-api-test-tool-on-canton/BUILD.bazel
@@ -188,7 +188,5 @@ conformance_test(
         "--verbose",
         "--concurrent-test-runs=1",  # lowered from default #procs to reduce flakes - details in https://github.com/digital-asset/daml/issues/7316
         "--include=ParticipantPruningIT",
-        # Disable tests targeting only multi-participant setups
-        "--exclude=ParticipantPruningIT:PRDisclosureAndRetroactiveDivulgence",
     ],
 ) if not is_windows else None
diff --git a/...t-integration-api/src/main/scala/platform/store/backend/common/CommonStorageBackend.scala b/...t-integration-api/src/main/scala/platform/store/backend/common/CommonStorageBackend.scala
@@ -524,22 +524,6 @@ private[backend] trait CommonStorageBackend[DB_BATCH] extends StorageBackend[DB_
             )"""
     }(connection, loggingContext)
 
-    pruneWithLogging(queryDescription = "Exercise (consuming) events pruning") {
-      SQL"""
-          -- Exercise events (consuming)
-          delete from participant_events_consuming_exercise delete_events
-          where
-            delete_events.event_offset <= $pruneUpToInclusive"""
-    }(connection, loggingContext)
-
-    pruneWithLogging(queryDescription = "Exercise (non-consuming) events pruning") {
-      SQL"""
-          -- Exercise events (non-consuming)
-          delete from participant_events_non_consuming_exercise delete_events
-          where
-            delete_events.event_offset <= $pruneUpToInclusive"""
-    }(connection, loggingContext)
-
     if (pruneAllDivulgedContracts) {
       val pruneAfterClause =
         participantAllDivulgedContractsPrunedUpToInclusive(connection) match {
@@ -565,6 +549,22 @@ private[backend] trait CommonStorageBackend[DB_BATCH] extends StorageBackend[DB_
          """
       }(connection, loggingContext)
     }
+
+    pruneWithLogging(queryDescription = "Exercise (consuming) events pruning") {
+      SQL"""
+          -- Exercise events (consuming)
+          delete from participant_events_consuming_exercise delete_events
+          where
+            delete_events.event_offset <= $pruneUpToInclusive"""
+    }(connection, loggingContext)
+
+    pruneWithLogging(queryDescription = "Exercise (non-consuming) events pruning") {
+      SQL"""
+          -- Exercise events (non-consuming)
+          delete from participant_events_non_consuming_exercise delete_events
+          where
+            delete_events.event_offset <= $pruneUpToInclusive"""
+    }(connection, loggingContext)
   }
 
   private def participantAllDivulgedContractsPrunedUpToInclusive(