Skip to content

Commit 6da48e8

Browse files
Retire delegate election (#1633)
Signed-off-by: Julien Tinguely <julien.tinguely@digitalasset.com>
1 parent 4e197f6 commit 6da48e8

File tree

86 files changed

+193
-1990
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+193
-1990
lines changed

apps/app/src/main/scala/org/lfdecentralizedtrust/splice/console/SvAppReference.scala

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -376,18 +376,6 @@ class SvAppBackendReference(
376376
}
377377
}
378378

379-
@Help.Summary("Create an election request (via admin API)")
380-
def createElectionRequest(
381-
requester: String,
382-
ranking: Vector[String],
383-
): Unit = {
384-
consoleEnvironment.run {
385-
httpCommand(
386-
HttpSvAdminAppClient.CreateElectionRequest(requester, ranking)
387-
)
388-
}
389-
}
390-
391379
@Help.Summary("Get the CometBFT node debug dump")
392380
def cometBftNodeDump(): definitions.CometBftNodeDumpResponse =
393381
consoleEnvironment.run {

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@
3131

3232
enable-expire-validator-faucet = true
3333

34-
# TODO(DACH-NY/canton-network-node#7649) revise and/or remove
35-
enable-dso-delegate-replacement-trigger = true
36-
3734
# CometBFT reconciliation is disabled by default as it would destabilize the CometBFT network by reflecting the
3835
# DSORules state in the topology of the CometBFT network, therefore nodes would be added and remove as validators quite often,
3936
# leading to a very slow CometBFT network

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -206,13 +206,6 @@ case class EnvironmentDefinition(
206206
)(config)
207207
)
208208

209-
def withoutDsoDelegateReplacement: EnvironmentDefinition =
210-
addConfigTransform((_, config) =>
211-
ConfigTransforms.updateAllAutomationConfigs(
212-
_.focus(_.enableDsoDelegateReplacementTrigger).replace(false)
213-
)(config)
214-
)
215-
216209
def withHttpSettingsForHigherThroughput: EnvironmentDefinition =
217210
addConfigTransform((_, config) =>
218211
config.copy(pekkoConfig =

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class AutomationControlIntegrationTest
4949
.max
5050

5151
// The trigger that advances rounds, running in the sv app
52-
// Note: using `def`, as the trigger may be destroyed and recreated (when the sv delegate changes)
52+
// Note: using `def`, as the trigger may be destroyed and recreated
5353
def trigger = sv1Backend.dsoDelegateBasedAutomation
5454
.trigger[AdvanceOpenMiningRoundTrigger]
5555

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,7 @@ class BootstrapPackageConfigDarUploadIntegrationTest
3232

3333
override implicit val patienceConfig: PatienceConfig = PatienceConfig(scaled(Span(1, Minute)))
3434

35-
private val initialPackageConfig = InitialPackageConfig(
36-
amuletVersion = "0.1.8",
37-
amuletNameServiceVersion = "0.1.8",
38-
dsoGovernanceVersion = "0.1.11",
39-
validatorLifecycleVersion = "0.1.2",
40-
walletVersion = "0.1.8",
41-
walletPaymentsVersion = "0.1.8",
42-
)
35+
private val initialPackageConfig = InitialPackageConfig.minimumInitialPackageConfig
4336

4437
override def environmentDefinition: SpliceEnvironmentDefinition =
4538
EnvironmentDefinition

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,9 @@ class BootstrapPackageConfigIntegrationTest
6565
override implicit val patienceConfig: PatienceConfig = PatienceConfig(scaled(Span(1, Minute)))
6666

6767
// Factored out so we can reuse it in the test
68-
val initialAmulet = DarResources.amulet_0_1_8
69-
70-
private val initialPackageConfig = InitialPackageConfig(
71-
amuletVersion = initialAmulet.metadata.version.toString,
72-
amuletNameServiceVersion = "0.1.8",
73-
dsoGovernanceVersion = "0.1.11",
74-
validatorLifecycleVersion = "0.1.2",
75-
walletVersion = "0.1.8",
76-
walletPaymentsVersion = "0.1.8",
77-
)
68+
val initialAmulet = DarResources.amulet_0_1_9
69+
70+
private val initialPackageConfig = InitialPackageConfig.minimumInitialPackageConfig
7871

7972
override def environmentDefinition: SpliceEnvironmentDefinition =
8073
EnvironmentDefinition

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

Lines changed: 0 additions & 257 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class ScanHistoryBackfillingIntegrationTest
8888
val tapAmount = com.digitalasset.daml.lf.data.Numeric.assertFromString("42.0")
8989

9090
// The trigger that advances rounds, running in the sv app
91-
// Note: using `def`, as the trigger may be destroyed and recreated (when the sv delegate changes)
91+
// Note: using `def`, as the trigger may be destroyed and recreated
9292
def advanceRoundsTrigger = sv1Backend.dsoDelegateBasedAutomation
9393
.trigger[AdvanceOpenMiningRoundTrigger]
9494

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ class ScanIntegrationTest extends IntegrationTest with WalletTestUtil with TimeT
594594
bobValidatorRewardsTrigger.resume()
595595

596596
// The trigger that advances rounds, running in the sv app
597-
// Note: using `def`, as the trigger may be destroyed and recreated (when the sv delegate changes)
597+
// Note: using `def`, as the trigger may be destroyed and recreated
598598
def advanceTrigger = sv1Backend.dsoDelegateBasedAutomation
599599
.trigger[AdvanceOpenMiningRoundTrigger]
600600

0 commit comments

Comments
 (0)