Skip to content

Commit 6640ae1

Browse files
moritzkiefer-dacocreature
moritzkiefer-da
and
cocreature
authored
Cleanup daml package version naming (#3641)
Bootstrap doesn't really make sense anymore, it's just `latest` at this point. Also deletes some unused code. [ci] Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org> Co-authored-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
1 parent 21e7b06 commit 6640ae1

File tree

12 files changed

+46
-70
lines changed

12 files changed

+46
-70
lines changed

‎apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/InitialPackageVersions.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ object InitialPackageVersions {
1515

1616
def initialPackageVersion(pkg: PackageResource): String =
1717
initialPackageVersionMap.getOrElse(
18-
pkg.bootstrap.metadata.name,
19-
pkg.bootstrap.metadata.version.toString,
18+
pkg.latest.metadata.name,
19+
pkg.latest.metadata.version.toString,
2020
)
2121
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ class AppUpgradeIntegrationTest
232232
// SV1 does not vet DAR before the vote goes through
233233
val sv1Packages = vettedPackages(sv1Backend.participantClientWithAdminToken)
234234
forAll(sv1Packages) { pkg =>
235-
pkg.packageId should not be DarResources.amulet.bootstrap.packageId
235+
pkg.packageId should not be DarResources.amulet.latest.packageId
236236
}
237237

238238
val amuletRules = sv2ScanBackend.getAmuletRules()
@@ -249,12 +249,12 @@ class AppUpgradeIntegrationTest
249249
amuletConfig.decentralizedSynchronizer,
250250
amuletConfig.tickDuration,
251251
new splice.amuletconfig.PackageConfig(
252-
DarResources.amulet.bootstrap.metadata.version.toString(),
253-
DarResources.amuletNameService.bootstrap.metadata.version.toString(),
254-
DarResources.dsoGovernance.bootstrap.metadata.version.toString(),
255-
DarResources.validatorLifecycle.bootstrap.metadata.version.toString(),
256-
DarResources.wallet.bootstrap.metadata.version.toString(),
257-
DarResources.walletPayments.bootstrap.metadata.version.toString(),
252+
DarResources.amulet.latest.metadata.version.toString(),
253+
DarResources.amuletNameService.latest.metadata.version.toString(),
254+
DarResources.dsoGovernance.latest.metadata.version.toString(),
255+
DarResources.validatorLifecycle.latest.metadata.version.toString(),
256+
DarResources.wallet.latest.metadata.version.toString(),
257+
DarResources.walletPayments.latest.metadata.version.toString(),
258258
),
259259
java.util.Optional.empty(),
260260
java.util.Optional.empty(),
@@ -365,7 +365,7 @@ class AppUpgradeIntegrationTest
365365
vettedPackages(sv1Backend.participantClientWithAdminToken)
366366
forExactly(1, sv1PackagesAfterUpgrade) { pkg =>
367367
withClue(s"Package ${pkg.packageId}") {
368-
pkg.packageId shouldBe DarResources.amulet.bootstrap.packageId
368+
pkg.packageId shouldBe DarResources.amulet.latest.packageId
369369
}
370370
}
371371

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ class BootstrapPackageConfigDarUploadIntegrationTest
118118
.futureValue
119119
.map(dar => dar.name -> PackageVersion.assertFromString(dar.version))
120120
.filter { case (name, _) =>
121-
DarResources.packageResources.map(_.bootstrap.metadata.name).contains(name)
121+
DarResources.packageResources.map(_.latest.metadata.name).contains(name)
122122
}
123123
val vettedDarNameAndVersions: Seq[(PackageName, PackageVersion)] = {
124124
vettedPackages
@@ -145,11 +145,11 @@ class BootstrapPackageConfigDarUploadIntegrationTest
145145
requiredVersion: String,
146146
): Unit = {
147147
withClue(
148-
s"dars for package ${packageResource.bootstrap.metadata.name} should be up to $requiredVersion"
148+
s"dars for package ${packageResource.latest.metadata.name} should be up to $requiredVersion"
149149
) {
150150
val dars =
151151
uploadedDars.filter { case (name, _) =>
152-
name == packageResource.bootstrap.metadata.name
152+
name == packageResource.latest.metadata.name
153153
}
154154
dars should not be empty
155155
dars.map(_._2).max shouldBe PackageVersion.assertFromString(requiredVersion)

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,12 @@ class BootstrapPackageConfigIntegrationTest extends IntegrationTest with Splitwe
220220
amuletConfig.decentralizedSynchronizer,
221221
amuletConfig.tickDuration,
222222
new PackageConfig(
223-
DarResources.amulet.bootstrap.metadata.version.toString(),
224-
DarResources.amuletNameService.bootstrap.metadata.version.toString(),
225-
DarResources.dsoGovernance.bootstrap.metadata.version.toString(),
226-
DarResources.validatorLifecycle.bootstrap.metadata.version.toString(),
227-
DarResources.wallet.bootstrap.metadata.version.toString(),
228-
DarResources.walletPayments.bootstrap.metadata.version.toString(),
223+
DarResources.amulet.latest.metadata.version.toString(),
224+
DarResources.amuletNameService.latest.metadata.version.toString(),
225+
DarResources.dsoGovernance.latest.metadata.version.toString(),
226+
DarResources.validatorLifecycle.latest.metadata.version.toString(),
227+
DarResources.wallet.latest.metadata.version.toString(),
228+
DarResources.walletPayments.latest.metadata.version.toString(),
229229
),
230230
java.util.Optional.empty(),
231231
java.util.Optional.empty(),
@@ -272,7 +272,7 @@ class BootstrapPackageConfigIntegrationTest extends IntegrationTest with Splitwe
272272
_ => {
273273
val newAmuletRules = sv1Backend.getDsoInfo().amuletRules
274274

275-
newAmuletRules.payload.configSchedule.initialValue.packageConfig.amulet shouldBe DarResources.amulet.bootstrap.metadata.version
275+
newAmuletRules.payload.configSchedule.initialValue.packageConfig.amulet shouldBe DarResources.amulet.latest.metadata.version
276276
.toString()
277277
},
278278
)
@@ -340,7 +340,7 @@ class BootstrapPackageConfigIntegrationTest extends IntegrationTest with Splitwe
340340
}
341341

342342
clue("alice taps amulet with new package after all the svs vet the new packages") {
343-
alicesTapsWithPackageId(DarResources.amulet.bootstrap.packageId)
343+
alicesTapsWithPackageId(DarResources.amulet.latest.packageId)
344344
}
345345

346346
clue("ExternalPartyAmuletRules gets created") {
@@ -464,9 +464,9 @@ class BootstrapPackageConfigIntegrationTest extends IntegrationTest with Splitwe
464464
)
465465
}
466466
}
467-
packagesAreVetted(DarResources.amulet.bootstrap, PackageIdResolver.Package.SpliceAmulet)
467+
packagesAreVetted(DarResources.amulet.latest, PackageIdResolver.Package.SpliceAmulet)
468468
// also check wallet because for the sv we have 2 vetting triggers, and the wallet is used in the tap call but it's vetted by the validator trigger (amulet rules can be vetted by any of the triggers)
469-
packagesAreVetted(DarResources.wallet.bootstrap, PackageIdResolver.Package.SpliceWallet)
469+
packagesAreVetted(DarResources.wallet.latest, PackageIdResolver.Package.SpliceWallet)
470470
}
471471

472472
private def alicesTapsWithPackageId(

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class RewardExpiryIntegrationTest extends IntegrationTest with TriggerTestUtil {
9090
actAndCheck(
9191
"SV1 uploads the latest dso governance",
9292
sv1Backend.participantClient.dars.upload(
93-
s"daml/dars/splice-dso-governance-${DarResources.dsoGovernance.bootstrap.metadata.version}.dar"
93+
s"daml/dars/splice-dso-governance-${DarResources.dsoGovernance.latest.metadata.version}.dar"
9494
),
9595
)(
9696
"SV1 has vetted the latest dso governance",
@@ -103,7 +103,7 @@ class RewardExpiryIntegrationTest extends IntegrationTest with TriggerTestUtil {
103103
.loneElement
104104
.item
105105
.packages
106-
.map(_.packageId) should contain(DarResources.dsoGovernance.bootstrap.packageId),
106+
.map(_.packageId) should contain(DarResources.dsoGovernance.latest.packageId),
107107
)
108108
actAndCheck("Advance by one tick", advanceRoundsByOneTickViaAutomation())(
109109
"Round 0 is closed",
@@ -121,7 +121,7 @@ class RewardExpiryIntegrationTest extends IntegrationTest with TriggerTestUtil {
121121
.data
122122
.round
123123
.number shouldBe 0
124-
closedRound.getTemplateId.packageId shouldBe DarResources.amulet.bootstrap.packageId
124+
closedRound.getTemplateId.packageId shouldBe DarResources.amulet.latest.packageId
125125
},
126126
)
127127
// Recreate AmuletRules in new package id.
@@ -140,8 +140,8 @@ class RewardExpiryIntegrationTest extends IntegrationTest with TriggerTestUtil {
140140
_ => {
141141
val amuletRules = sv1ScanBackend
142142
.getAmuletRules()
143-
amuletRules.contract.identifier.getPackageId shouldBe DarResources.amulet.bootstrap.packageId
144-
DarResources.amulet.bootstrap.packageId should not be initialAmuletPackage.packageId
143+
amuletRules.contract.identifier.getPackageId shouldBe DarResources.amulet.latest.packageId
144+
DarResources.amulet.latest.packageId should not be initialAmuletPackage.packageId
145145
},
146146
)
147147
aliceValidatorBackend.participantClient.ledger_api_extensions.acs

‎apps/common/src/main/scala/org/lfdecentralizedtrust/splice/environment/DarResources.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ object DarResources {
380380
/** All DARs for a given package
381381
*/
382382
final case class PackageResource(
383-
bootstrap: DarResource, // Used during bootstrapping or testing where we can assume a fixed package id.
383+
latest: DarResource, // latest package version
384384
minimumInitialization: DarResource, // The minimum version that can be used for initialization of a fresh network
385385
others: Seq[DarResource], // Other DARs for the same package
386386
) {
@@ -392,7 +392,7 @@ final case class PackageResource(
392392
all.find(_.metadata.version.toString() == version)
393393
}
394394

395-
def all = bootstrap +: others
395+
def all = latest +: others
396396
}
397397

398398
final case class DarResource(

‎apps/common/src/main/scala/org/lfdecentralizedtrust/splice/environment/PackageIdResolver.scala‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,21 @@ object PackageIdResolver {
3131
case SpliceWallet => packageConfig.wallet
3232
case SpliceWalletPayments => packageConfig.walletPayments
3333
case TokenStandard.SpliceApiTokenMetadataV1 =>
34-
DarResources.TokenStandard.tokenMetadata.bootstrap.metadata.version.toString()
34+
DarResources.TokenStandard.tokenMetadata.latest.metadata.version.toString()
3535
case TokenStandard.SpliceApiTokenHoldingV1 =>
36-
DarResources.TokenStandard.tokenHolding.bootstrap.metadata.version.toString()
36+
DarResources.TokenStandard.tokenHolding.latest.metadata.version.toString()
3737
case TokenStandard.SpliceApiTokenTransferInstructionV1 =>
38-
DarResources.TokenStandard.tokenTransferInstruction.bootstrap.metadata.version.toString()
38+
DarResources.TokenStandard.tokenTransferInstruction.latest.metadata.version.toString()
3939
case TokenStandard.SpliceApiTokenAllocationV1 =>
40-
DarResources.TokenStandard.tokenAllocation.bootstrap.metadata.version.toString()
40+
DarResources.TokenStandard.tokenAllocation.latest.metadata.version.toString()
4141
case TokenStandard.SpliceApiTokenAllocationRequestV1 =>
42-
DarResources.TokenStandard.tokenAllocationRequest.bootstrap.metadata.version.toString()
42+
DarResources.TokenStandard.tokenAllocationRequest.latest.metadata.version.toString()
4343
case TokenStandard.SpliceApiTokenAllocationInstructionV1 =>
44-
DarResources.TokenStandard.tokenAllocationInstruction.bootstrap.metadata.version.toString()
44+
DarResources.TokenStandard.tokenAllocationInstruction.latest.metadata.version.toString()
4545
case TokenStandard.SpliceTokenTestTradingApp =>
46-
DarResources.TokenStandard.tokenTestTradingApp.bootstrap.metadata.version.toString()
46+
DarResources.TokenStandard.tokenTestTradingApp.latest.metadata.version.toString()
4747
case FeaturedApp =>
48-
DarResources.featuredApp.bootstrap.metadata.version.toString()
48+
DarResources.featuredApp.latest.metadata.version.toString()
4949
}
5050
PackageVersion.assertFromString(version)
5151
}

‎apps/common/src/main/scala/org/lfdecentralizedtrust/splice/util/SpliceUtil.scala‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ object SpliceUtil {
5757

5858
def readPackageConfig(): splice.amuletconfig.PackageConfig = {
5959
new splice.amuletconfig.PackageConfig(
60-
readDarVersion(DarResources.amulet.bootstrap).toString,
61-
readDarVersion(DarResources.amuletNameService.bootstrap).toString,
62-
readDarVersion(DarResources.dsoGovernance.bootstrap).toString,
63-
readDarVersion(DarResources.validatorLifecycle.bootstrap).toString,
64-
readDarVersion(DarResources.wallet.bootstrap).toString,
65-
readDarVersion(DarResources.walletPayments.bootstrap).toString,
60+
readDarVersion(DarResources.amulet.latest).toString,
61+
readDarVersion(DarResources.amuletNameService.latest).toString,
62+
readDarVersion(DarResources.dsoGovernance.latest).toString,
63+
readDarVersion(DarResources.validatorLifecycle.latest).toString,
64+
readDarVersion(DarResources.wallet.latest).toString,
65+
readDarVersion(DarResources.walletPayments.latest).toString,
6666
)
6767
}
6868

‎apps/splitwell/src/main/scala/org/lfdecentralizedtrust/splice/splitwell/config/SplitwellAppConfig.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ case class SplitwellAppBackendConfig(
4242
domainMigrationId: Long = 0L,
4343
domains: SplitwellSynchronizerConfig,
4444
parameters: SpliceParametersConfig = SpliceParametersConfig(batching = BatchingConfig()),
45-
requiredDarVersion: PackageVersion = DarResources.splitwell.bootstrap.metadata.version,
45+
requiredDarVersion: PackageVersion = DarResources.splitwell.latest.metadata.version,
4646
) extends SpliceBackendConfig // TODO(DACH-NY/canton-network-node#736): fork or generalize this trait.
4747
{
4848
override val nodeTypeName: String = "splitwell"

‎apps/sv/src/main/scala/org/lfdecentralizedtrust/splice/sv/automation/SvDsoAutomationService.scala‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,11 @@ import org.lfdecentralizedtrust.splice.sv.automation.singlesv.offboarding.{
4444
import org.lfdecentralizedtrust.splice.sv.automation.singlesv.onboarding.*
4545
import org.lfdecentralizedtrust.splice.sv.automation.singlesv.scan.AggregatingScanConnection
4646
import org.lfdecentralizedtrust.splice.sv.cometbft.CometBftNode
47-
import org.lfdecentralizedtrust.splice.sv.config.SvOnboardingConfig.InitialPackageConfig
4847
import org.lfdecentralizedtrust.splice.sv.config.{SequencerPruningConfig, SvAppBackendConfig}
4948
import org.lfdecentralizedtrust.splice.sv.migration.DecentralizedSynchronizerMigrationTrigger
5049
import org.lfdecentralizedtrust.splice.sv.store.{SvDsoStore, SvSvStore}
5150
import org.lfdecentralizedtrust.splice.sv.{BftSequencerConfig, LocalSynchronizerNode}
52-
import org.lfdecentralizedtrust.splice.util.{QualifiedName, TemplateJsonDecoder}
51+
import org.lfdecentralizedtrust.splice.util.TemplateJsonDecoder
5352

5453
import java.nio.file.Path
5554
import scala.concurrent.ExecutionContextExecutor
@@ -476,23 +475,6 @@ object SvDsoAutomationService extends AutomationServiceCompanion {
476475
decentralizedSynchronizerAlias: SynchronizerAlias,
477476
)
478477

479-
private[automation] def bootstrapPackageIdResolver(
480-
initialPackageConfig: Option[InitialPackageConfig]
481-
)(template: QualifiedName): Option[String] =
482-
template.moduleName match {
483-
// DsoBootstrap is how we create AmuletRules in the first place so we cannot infer the package id for that from AmuletRules.
484-
// We could infer it from initialPackageConfig
485-
case "Splice.DsoBootstrap" =>
486-
initialPackageConfig
487-
.flatMap(config =>
488-
DarResources.dsoGovernance.getPackageIdWithVersion(config.dsoGovernanceVersion)
489-
)
490-
.orElse(
491-
Some(DarResources.dsoGovernance.bootstrap.packageId)
492-
)
493-
case _ => None
494-
}
495-
496478
// defined because some triggers are registered later by
497479
// registerPostOnboardingTriggers
498480
override protected[this] def expectedTriggerClasses: Seq[TriggerClass] =

0 commit comments

Comments
 (0)