Unflake pruning things in ManualStartIntegrationTest (#3289)

Fixes DACH-NY/cn-test-failures#6547
Fixes DACH-NY/cn-test-failures#6552

Signed-off-by: Martin Florian <martin.florian@digitalasset.com>

Author: martinflorian-da

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/ManualStartIntegrationTest.scala

@@ -43,6 +43,13 @@ class ManualStartIntegrationTest
 
   override lazy val dbsSuffix = "manual_start_2_" + UUID.randomUUID.toString.substring(0, 4)
 
+  val sv1PruningScheduleOverride = PruningConfig(
+    // run every 10s, for quick feedback
+    "/10 * * * * ?",
+    PositiveDurationSeconds.tryFromDuration(10.seconds),
+    PositiveDurationSeconds.tryFromDuration(20.seconds),
+  )
+
   override def environmentDefinition: SpliceEnvironmentDefinition = {
     EnvironmentDefinition
       // Do not use `simpleTopology4Svs`, because that one waits for shared canton nodes to be initialized
@@ -67,20 +74,6 @@ class ManualStartIntegrationTest
             }
           },
           validatorApps = conf.validatorApps
-            .updatedWith(InstanceName.tryCreate("sv1Validator")) {
-              _.map { config =>
-                config.copy(
-                  // schedule needs to be defined to activate participant pruning
-                  participantPruningSchedule = Some(
-                    PruningConfig(
-                      "0 /1 * * * ?",
-                      PositiveDurationSeconds.tryFromDuration(10.seconds),
-                      PositiveDurationSeconds.tryFromDuration(20.seconds),
-                    )
-                  )
-                )
-              }
-            }
             .updatedWith(InstanceName.tryCreate("aliceValidator")) {
               _.map { aliceValidatorConfig =>
                 val withoutExtraDomains = aliceValidatorConfig.domains.copy(extra = Seq.empty)
@@ -95,7 +88,13 @@ class ManualStartIntegrationTest
                   ),
                 )
               }
-            },
+            }
+            + (InstanceName.tryCreate("sv1ValidatorWithPruning") ->
+              conf
+                .validatorApps(InstanceName.tryCreate("sv1Validator"))
+                .copy(
+                  participantPruningSchedule = Some(sv1PruningScheduleOverride)
+                )),
         )
       )
       // Add a suffix to the canton identifiers to avoid metric conflicts with the shared canton nodes
@@ -138,15 +137,16 @@ class ManualStartIntegrationTest
           "EXTRA_PARTICIPANT_DB" -> ("participant_extra_" + dbsSuffix),
         ),
       )() {
-        val allCnApps = Seq[AppBackendReference](
+        val allCnAppsBase = Seq[AppBackendReference](
           sv1Backend,
           sv1ScanBackend,
-          sv1ValidatorBackend,
           sv2Backend,
           sv2ScanBackend,
           sv2ValidatorBackend,
           aliceValidatorBackend,
         )
+        val allCnAppsAtStart = allCnAppsBase ++ Seq(sv1ValidatorBackend)
+        val allCnApps = allCnAppsBase ++ Seq(sv1ValidatorWithPruningBackend)
 
         val allTopologyConnections
             : Seq[(TopologyAdminConnection, UniqueIdentifier => Member & NodeIdentity)] = Seq(
@@ -174,21 +174,23 @@ class ManualStartIntegrationTest
         }
 
         clue("Starting all Splice apps") {
-          startAllSync(allCnApps*)
+          startAllSync(allCnAppsAtStart*)
+        }
+
+        // We want to set pruning a bit later so it doesn't break init
+        clue("Restart sv1 validator with pruning enabled") {
+          sv1ValidatorBackend.stop()
+          sv1ValidatorWithPruningBackend.startSync()
         }
 
-        clue("Check sv1 participant has the expected smallest pruning schedule") {
+        clue("Check sv1 participant has the expected pruning schedule") {
           sv1ValidatorBackend.participantClient.pruning.get_schedule() shouldBe Some(
-            PruningSchedule(
-              "0 /1 * * * ?",
-              PositiveDurationSeconds.tryFromDuration(10.seconds),
-              PositiveDurationSeconds.tryFromDuration(20.seconds),
-            )
+            sv1PruningScheduleOverride.toSchedule
           )
         }
 
         clue("Check sv1 participant is actively pruning") {
-          eventually(2.minutes) {
+          eventually() {
             sv1Backend.svAutomation
               .connection(Low)
               // returns 0 when participant pruning is disabled

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/util/CommonAppInstanceReferences.scala

@@ -197,6 +197,12 @@ trait CommonAppInstanceReferences {
     "sv1ValidatorLocal"
   )
 
+  def sv1ValidatorWithPruningBackend(implicit
+      env: SpliceTestConsoleEnvironment
+  ): ValidatorAppBackendReference = v(
+    "sv1ValidatorWithPruning"
+  )
+
   def sv2ValidatorBackend(implicit
       env: SpliceTestConsoleEnvironment
   ): ValidatorAppBackendReference = v(