Revert "Reset network with non-zero initial round (#1658)" (#1680)

[ci]

This reverts commit c9e77b9.

Signed-off-by: Moritz Kiefer <[email protected]>
Co-authored-by: Moritz Kiefer <[email protected]>

Author: moritzkiefer-da

apps/app/src/test/resources/include/svs/sv1.conf

@@ -44,7 +44,6 @@
     is-dev-net = true
     # We assume the foundation is the sv1 and gets a Tier 1 node (weight 10)
     first-sv-reward-weight-bps = 10000
-    initial-round = 0
   }
 
   scan {

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

@@ -113,8 +113,6 @@ class DecentralizedSynchronizerMigrationIntegrationTest
     with StandaloneCanton
     with SplitwellTestUtil {
 
-  private val initialRound = 481516L
-
   override def dbsSuffix = "domain_migration"
 
   override implicit val patienceConfig: PatienceConfig = PatienceConfig(scaled(Span(1, Minute)))
@@ -412,11 +410,6 @@ class DecentralizedSynchronizerMigrationIntegrationTest
             _.withPausedTrigger[ReceiveSvRewardCouponTrigger]
           )(conf),
       )
-      .addConfigTransforms((_, config) =>
-        ConfigTransforms.updateAllSvAppFoundDsoConfigs_(
-          _.copy(initialRound = initialRound)
-        )(config)
-      )
       .withManualStart
       // TODO (#965) remove and fix test failures
       .withAmuletPrice(walletAmuletPrice)
@@ -1049,7 +1042,7 @@ class DecentralizedSynchronizerMigrationIntegrationTest
                       "Bob",
                       SvUtil.DefaultSV1Weight,
                       "bob-participant-id",
-                      new Round(initialRound + 42),
+                      new Round(42),
                     )
                   )
                 ),
@@ -1176,12 +1169,6 @@ class DecentralizedSynchronizerMigrationIntegrationTest
                 sv1LocalBackend.startSync()
               }
 
-              withClueAndLog(s"SVs have $initialRound as initial round") {
-                Seq(sv1LocalBackend, sv2LocalBackend).foreach { sv =>
-                  sv.getDsoInfo().initialRound shouldBe initialRound.toString
-                }
-              }
-
               withClueAndLog("sv1 restarts without any onboarding type") {
                 sv1LocalBackend.stop()
                 svb("sv1LocalOnboarded").startSync()

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

@@ -22,7 +22,6 @@ import org.lfdecentralizedtrust.splice.console.{
   SvAppBackendReference,
   ValidatorAppBackendReference,
 }
-import org.lfdecentralizedtrust.splice.environment.BaseLedgerConnection.INITIAL_ROUND_USER_METADATA_KEY
 import org.lfdecentralizedtrust.splice.http.v0.definitions.TransactionHistoryRequest
 import org.lfdecentralizedtrust.splice.integration.EnvironmentDefinition
 import org.lfdecentralizedtrust.splice.integration.tests.SpliceTests.{
@@ -243,20 +242,18 @@ class DisasterRecoveryIntegrationTest
     runTest(
       "lost-all-sequencers-most-participants",
       (identities, timestampBeforeDisaster) => {
+        val dump =
+          sv2Backend
+            .getDomainDataSnapshot(
+              timestampBeforeDisaster,
+              Some(identities.head.dsoPartyId),
+              force = true,
+            )
+        dump.dataSnapshot.acsTimestamp should be(timestampBeforeDisaster)
+        dump.createdAt should be(timestampBeforeDisaster)
+        dump.migrationId shouldBe 1
         Seq(sv1Backend, sv2Backend, sv3Backend, sv4Backend).zip(identities).foreach {
           case (sv, ids) =>
-            val dump =
-              sv
-                .getDomainDataSnapshot(
-                  timestampBeforeDisaster,
-                  Some(identities.head.dsoPartyId),
-                  force = true,
-                )
-            dump.dataSnapshot.acsTimestamp should be(timestampBeforeDisaster)
-            dump.createdAt should be(timestampBeforeDisaster)
-            dump.migrationId shouldBe 1
-            dump.participantUsers.users
-              .find(_.annotations.contains(INITIAL_ROUND_USER_METADATA_KEY)) should not be empty
             writeMigrationDumpFile(sv, ids, dump)
         }
       },
@@ -610,9 +607,7 @@ class DisasterRecoveryIntegrationTest
     clue(s"Waiting for all SVs participants to be caught up to $timestamp") {
       Seq(sv1Backend, sv2Backend, sv3Backend, sv4Backend).foreach(svBackend =>
         eventuallySucceeds() {
-          val snapshot = svBackend.getDomainDataSnapshot(timestamp, force = true)
-          snapshot.participantUsers.users
-            .find(_.annotations.contains(INITIAL_ROUND_USER_METADATA_KEY)) should not be empty
+          svBackend.getDomainDataSnapshot(timestamp, force = true)
         }
       )
     }
@@ -649,7 +644,7 @@ class DisasterRecoveryIntegrationTest
       migrationId = dump.migrationId,
       ids,
       dump.dataSnapshot,
-      dump.participantUsers,
+      None,
       createdAt = dump.createdAt,
     )
     fullDumpFile.write(fullDump.asJson.spaces2)

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

@@ -43,8 +43,6 @@ class ScanHistoryBackfillingIntegrationTest
     with HasActorSystem
     with HasExecutionContext {
 
-  val initialRound = 48151623L
-
   override def environmentDefinition: SpliceEnvironmentDefinition =
     EnvironmentDefinition
       .simpleTopology4Svs(this.getClass.getSimpleName)
@@ -73,11 +71,6 @@ class ScanHistoryBackfillingIntegrationTest
           )
         )(config)
       )
-      .addConfigTransforms((_, config) =>
-        ConfigTransforms.updateAllSvAppFoundDsoConfigs_(
-          _.copy(initialRound = initialRound)
-        )(config)
-      )
       // The wallet automation periodically merges amulets, which leads to non-deterministic balance changes.
       // We disable the automation for this suite.
       .withoutAutomaticRewardsCollectionAndAmuletMerging

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

@@ -84,7 +84,6 @@ class ScanIntegrationTest extends IntegrationTest with WalletTestUtil with TimeT
             amuletRules,
             dsoRules,
             svNodeStates,
-            _,
           ) =>
         scan.svUser should be(svUser)
         scan.svPartyId should be(svParty.toProtoPrimitive)