Skip to content

Commit 286badb

Browse files
authored
[ci] Run sv rewards trigger during a random time between the round open and one tick (#2669)
Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
1 parent 68b716b commit 286badb

File tree

16 files changed

+168
-50
lines changed

16 files changed

+168
-50
lines changed

apps/app/src/main/scala/org/lfdecentralizedtrust/splice/config/ConfigTransforms.scala

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,12 @@ object ConfigTransforms {
333333
}
334334
)
335335

336+
def updateInitialTickDuration(tick: NonNegativeFiniteDuration): ConfigTransform = {
337+
ConfigTransforms.updateAllSvAppFoundDsoConfigs_(
338+
_.copy(initialTickDuration = tick)
339+
)
340+
}
341+
336342
def noDevNet: ConfigTransform =
337343
updateAllSvAppFoundDsoConfigs_(_.focus(_.isDevNet).replace(false))
338344

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/EnvironmentDefinition.scala

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,12 @@ case class EnvironmentDefinition(
425425
.replace(NonNegativeFiniteDuration.Zero)
426426
)(conf)
427427
)
428+
.addConfigTransform((_, conf) =>
429+
ConfigTransforms.updateAllAutomationConfigs(
430+
// disable round based triggers because tests don't advance time for the triggers to run
431+
_.focus(_.enableNewRewardTriggerScheduling).replace(false)
432+
)(conf)
433+
)
428434
.withSequencerConnectionsFromScanDisabled(10_000)
429435

430436
override lazy val environmentFactory: EnvironmentFactory[SpliceConfig, SpliceEnvironment] =

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@ class AutomationControlIntegrationTest
2222
// start only sv1 but not sv2-4, to speed up the test
2323
.simpleTopology1Sv(this.getClass.getSimpleName)
2424
// Very short round ticks
25-
.addConfigTransforms((_, config) =>
26-
ConfigTransforms.updateAllSvAppFoundDsoConfigs_(
27-
_.copy(initialTickDuration = NonNegativeFiniteDuration.ofMillis(500))
28-
)(config)
25+
.addConfigTransform((_, config) =>
26+
ConfigTransforms.updateInitialTickDuration(NonNegativeFiniteDuration.ofMillis(500))(config)
2927
)
3028
// Start rounds trigger in paused state
3129
.addConfigTransforms((_, config) =>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ class ExternalPartySetupProposalIntegrationTest
9090
.withPausedTrigger[ExpireIssuingMiningRoundTrigger]
9191
)(config),
9292
(_, config) =>
93-
ConfigTransforms.updateAllSvAppFoundDsoConfigs_(
94-
_.copy(initialTickDuration = NonNegativeFiniteDuration.ofMillis(500))
93+
ConfigTransforms.updateInitialTickDuration(
94+
NonNegativeFiniteDuration.ofMillis(500)
9595
)(config),
9696
)
9797

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,14 @@ class FeaturedAppActivityMarkerIntegrationTest
3232
.addConfigTransforms((_, config) =>
3333
ConfigTransforms.updateAllSvAppFoundDsoConfigs_(
3434
_.copy(
35-
initialTickDuration = NonNegativeFiniteDuration.ofMillis(500),
3635
initialFeaturedAppActivityMarkerAmount = Some(1.0),
3736
initialAmuletPrice = 1.0,
3837
)
3938
)(config)
4039
)
40+
.addConfigTransform((_, config) =>
41+
ConfigTransforms.updateInitialTickDuration(NonNegativeFiniteDuration.ofMillis(500))(config)
42+
)
4143
.addConfigTransforms((_, config) =>
4244
updateAutomationConfig(ConfigurableApp.Sv)(
4345
_.withPausedTrigger[AdvanceOpenMiningRoundTrigger]

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,8 @@ class ScanHistoryBackfillingIntegrationTest
6565
.withPausedTrigger[DeleteCorruptAcsSnapshotTrigger]
6666
)(config)
6767
)
68-
.addConfigTransforms((_, config) =>
69-
ConfigTransforms.updateAllSvAppFoundDsoConfigs_(
70-
_.copy(initialTickDuration = NonNegativeFiniteDuration.ofMillis(500))
71-
)(config)
68+
.addConfigTransform((_, config) =>
69+
ConfigTransforms.updateInitialTickDuration(NonNegativeFiniteDuration.ofMillis(500))(config)
7270
)
7371
.addConfigTransforms((_, config) =>
7472
ConfigTransforms.updateAllScanAppConfigs((_, scanConfig) =>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,8 @@ class ScanIntegrationTest extends IntegrationTest with WalletTestUtil with TimeT
9292
)
9393
)(config)
9494
)
95-
.addConfigTransforms((_, config) =>
96-
ConfigTransforms.updateAllSvAppFoundDsoConfigs_(
97-
_.copy(initialTickDuration = NonNegativeFiniteDuration.ofMillis(500))
98-
)(config)
95+
.addConfigTransform((_, config) =>
96+
ConfigTransforms.updateInitialTickDuration(NonNegativeFiniteDuration.ofMillis(500))(config)
9997
)
10098
.withTrafficTopupsEnabled
10199

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,8 @@ class UnclaimedSvRewardsScriptIntegrationTest
4545
.withPausedTrigger[ArchiveClosedMiningRoundsTrigger]
4646
)(config)
4747
)
48-
.addConfigTransforms((_, config) =>
49-
ConfigTransforms.updateAllSvAppFoundDsoConfigs_(
50-
_.copy(initialTickDuration = NonNegativeFiniteDuration.ofMillis(500))
51-
)(config)
48+
.addConfigTransform((_, config) =>
49+
ConfigTransforms.updateInitialTickDuration(NonNegativeFiniteDuration.ofMillis(500))(config)
5250
)
5351
.withTrafficTopupsDisabled
5452

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,8 @@ class UpdateHistoryIntegrationTest
3939
_.withPausedTrigger[AdvanceOpenMiningRoundTrigger]
4040
)(config)
4141
)
42-
.addConfigTransforms((_, config) =>
43-
ConfigTransforms.updateAllSvAppFoundDsoConfigs_(
44-
_.copy(initialTickDuration = NonNegativeFiniteDuration.ofMillis(500))
45-
)(config)
42+
.addConfigTransform((_, config) =>
43+
ConfigTransforms.updateInitialTickDuration(NonNegativeFiniteDuration.ofMillis(500))(config)
4644
)
4745
.withTrafficTopupsDisabled
4846

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,8 @@ class WalletExpirationsIntegrationTest
4343
)(config)
4444
)
4545
// Very short round ticks
46-
.addConfigTransforms((_, config) =>
47-
ConfigTransforms.updateAllSvAppFoundDsoConfigs_(
48-
_.copy(initialTickDuration = NonNegativeFiniteDuration.ofMillis(500))
49-
)(config)
46+
.addConfigTransform((_, config) =>
47+
ConfigTransforms.updateInitialTickDuration(NonNegativeFiniteDuration.ofMillis(500))(config)
5048
)
5149
// Start rounds trigger in paused state
5250
.addConfigTransforms((_, config) =>

0 commit comments

Comments
 (0)