diff --git a/ledger/ledger-api-test-tool-on-canton/BUILD.bazel b/ledger/ledger-api-test-tool-on-canton/BUILD.bazel index e368f1967713..22bc6107fd85 100644 --- 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/ledger/participant-integration-api/src/main/scala/platform/store/backend/common/CommonStorageBackend.scala b/ledger/participant-integration-api/src/main/scala/platform/store/backend/common/CommonStorageBackend.scala index 5b0ae641a44d..8c0cd4f82dbe 100644 --- a/ledger/participant-integration-api/src/main/scala/platform/store/backend/common/CommonStorageBackend.scala +++ b/ledger/participant-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(