Skip to content

Fix "package vetted" check in AppUpgradeIntegrationTest test #3145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 10, 2025
Merged

Fix "package vetted" check in AppUpgradeIntegrationTest test #3145

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7135033
Fix "package vetted" check in `AppUpgradeIntegrationTest` test
martinflorian-da Nov 10, 2025
a6ae632
scalafmt
martinflorian-da Nov 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions ...t/scala/org/lfdecentralizedtrust/splice/integration/tests/AppUpgradeIntegrationTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ import org.lfdecentralizedtrust.splice.codegen.java.splice.dsorules.actionrequir
import org.lfdecentralizedtrust.splice.codegen.java.splice.wallet.payment as walletCodegen
import org.lfdecentralizedtrust.splice.integration.tests.AppUpgradeIntegrationTest.*
import org.lfdecentralizedtrust.splice.integration.EnvironmentDefinition
import org.lfdecentralizedtrust.splice.integration.tests.SpliceTests.IntegrationTest
import org.lfdecentralizedtrust.splice.integration.tests.SpliceTests.{
IntegrationTest,
SpliceTestConsoleEnvironment,
}
import org.lfdecentralizedtrust.splice.splitwell.admin.api.client.commands.HttpSplitwellAppClient
import org.lfdecentralizedtrust.splice.util.{
PostgresAroundEach,
Expand All @@ -22,7 +25,7 @@ import org.lfdecentralizedtrust.splice.wallet.store.BalanceChangeTxLogEntry
import com.digitalasset.canton.config.CantonRequireTypes.InstanceName
import com.digitalasset.canton.data.CantonTimestamp
import com.digitalasset.canton.logging.{NamedLoggerFactory, NamedLogging}
import com.digitalasset.canton.topology.admin.grpc.TopologyStoreId.Authorized
import com.digitalasset.canton.topology.admin.grpc.TopologyStoreId
import com.digitalasset.canton.topology.store.TimeQuery.HeadState
import monocle.macros.syntax.lens.*
import org.lfdecentralizedtrust.splice.console.ParticipantClientReference
Expand Down Expand Up @@ -357,14 +360,13 @@ class AppUpgradeIntegrationTest
},
)

// TODO(DACH-NY/cn-test-failures#443) fix and re-enable
// val sv1PackagesAfterUpgrade =
// vettedPackages(sv1Backend.participantClientWithAdminToken)
// forExactly(1, sv1PackagesAfterUpgrade) { pkg =>
// withClue(s"Package ${pkg.packageId}") {
// pkg.packageId shouldBe DarResources.amulet.bootstrap.packageId
// }
// }
val sv1PackagesAfterUpgrade =
vettedPackages(sv1Backend.participantClientWithAdminToken)
forExactly(1, sv1PackagesAfterUpgrade) { pkg =>
withClue(s"Package ${pkg.packageId}") {
pkg.packageId shouldBe DarResources.amulet.bootstrap.packageId
}
}

actAndCheck(
"Bob taps after upgrade",
Expand Down Expand Up @@ -522,12 +524,14 @@ class AppUpgradeIntegrationTest
}
}

private def vettedPackages(participant: ParticipantClientReference) = {
private def vettedPackages(
participant: ParticipantClientReference
)(implicit env: SpliceTestConsoleEnvironment) = {
participant.topology.vetted_packages
.list(
filterParticipant = participant.id.filterString,
timeQuery = HeadState,
store = Some(Authorized),
store = Some(TopologyStoreId.Synchronizer(decentralizedSynchronizerId)),
)
.flatMap(_.item.packages)
.filter(_.validFromInclusive.forall(_.isBefore(CantonTimestamp.now())))
Expand Down