Skip to content

Commit 872b912

Browse files
committed
.
[ci] Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
1 parent e585829 commit 872b912

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import org.scalatest.time.{Minutes, Span}
3434

3535
import java.net.URI
3636
import java.time.Duration
37+
import java.time.temporal.ChronoUnit
3738
import java.util.UUID
3839
import scala.collection.parallel.CollectionConverters.seqIsParallelizable
3940
import scala.concurrent.duration.DurationInt
@@ -223,11 +224,13 @@ class LogicalSynchronizerUpgradeIntegrationTest
223224
participants = false,
224225
logSuffix = "global-domain-migration",
225226
extraSequencerConfig = Seq(
226-
s"parameters.sequencing-time-lower-bound-exclusive = $upgradeTime"
227+
s"""parameters.sequencing-time-lower-bound-exclusive=${upgradeTime.toInstant.truncatedTo(
228+
ChronoUnit.SECONDS
229+
)}"""
227230
),
228231
)() {
229232

230-
val announcement = clue(s"Announce migration at $upgradeTime") {
233+
val announcement = clue(s"Announce upgrade at $upgradeTime") {
231234
allBackends.par.map { backend =>
232235
backend.participantClientWithAdminToken.topology.synchronizer_upgrade.announcement
233236
.propose(
@@ -279,10 +282,12 @@ class LogicalSynchronizerUpgradeIntegrationTest
279282
new NodeInitializer(newMediatorAdminConnection, retryProvider, loggerFactory)
280283

281284
clue(s"init ${oldBackend.name} sequencer and mediator from dump") {
285+
newBackend.sequencerClient.health.wait_for_ready_for_id()
282286
sequencerInitializer
283287
.initializeFromDump(dump.nodeIdentities.sequencer)
284288
.futureValue
285289

290+
newBackend.mediatorClient.health.wait_for_ready_for_id()
286291
mediatorInitializer.initializeFromDump(dump.nodeIdentities.mediator).futureValue
287292
}
288293
val staticSynchronizerParameters =
@@ -333,6 +338,12 @@ class LogicalSynchronizerUpgradeIntegrationTest
333338
// stop old backend as the topology trigger will push crazy stuff when the participant connect to the new sync but the topology was not sycned yet
334339
// https://github.com/DACH-NY/canton/issues/29819
335340
clue("Stop old backends") {
341+
stopAllAsync(
342+
sv1ValidatorBackend,
343+
sv2ValidatorBackend,
344+
sv3ValidatorBackend,
345+
sv4ValidatorBackend,
346+
).futureValue
336347
allBackends.par.map { backend =>
337348
backend.stop()
338349
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ trait StandaloneCanton extends PostgresAroundEach with NamedLogging with Process
128128
withCanton(
129129
configs,
130130
extraSequencerConfig.flatMap(config =>
131-
sequencers.map(id => s"canton.sequencer.standaloneSequencerSv$id.$config")
131+
sequencers.map(id => s"canton.sequencers.sv${id}StandaloneSequencer.$config")
132132
),
133133
logSuffix,
134134
allExtraEnv*

0 commit comments

Comments
 (0)