.

Signed-off-by: Moritz Kiefer <[email protected]>

Author: cocreature

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

@@ -106,7 +106,7 @@ case class EnvironmentDefinition(
     })
 
   def withInitialPackageVersions: EnvironmentDefinition =
-    addConfigTransform((_, config) =>
+    addConfigTransforms((_, config) =>
       ConfigTransforms.updateAllSvAppFoundDsoConfigs_(
         _.copy(
           // FIXME: read config from env var or something
@@ -119,6 +119,16 @@ case class EnvironmentDefinition(
             walletPaymentsVersion = "0.1.8",
           )
         )
+      )(config),
+      (_, config) =>
+      ConfigTransforms.updateAllValidatorAppConfigs_( c =>
+        c.copy(
+          appInstances = c.appInstances.transform {
+            // FIXME
+            case ("splitwell", instance) => instance.copy(dars = Seq(java.nio.file.Paths.get("daml/dars/splitwell-0.1.8.dar")))
+            case (_, instance) => instance
+          }
+        )
       )(config)
     )
 

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

@@ -116,8 +116,6 @@ class DecentralizedSynchronizerMigrationIntegrationTest
 
   override implicit val patienceConfig: PatienceConfig = PatienceConfig(scaled(Span(1, Minute)))
 
-  private val splitwellDarPath = "daml/splitwell/.daml/dist/splitwell-current.dar"
-
   override def environmentDefinition: SpliceEnvironmentDefinition =
     EnvironmentDefinition
       .simpleTopology4Svs(this.getClass.getSimpleName)

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

@@ -14,6 +14,8 @@ import org.lfdecentralizedtrust.tokenstandard.transferinstruction
 import java.time.Duration
 import java.util.Base64
 
+// does token standard stuff
+@org.lfdecentralizedtrust.splice.util.scalatesttags.Amulet_0_1_9
 class ExternallySignedTxsTimeBasedIntegrationTest
     extends IntegrationTest
     with WalletTestUtil

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

@@ -571,6 +571,9 @@ object SpliceTests extends LazyLogging {
           Http().shutdownAllConnectionPools().map(_ => Done)
       }
     }
+
+    // FIXME
+    protected def splitwellDarPath = "daml/dars/splitwell-0.1.8.dar"
   }
 
   object BracketSynchronous {

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

@@ -22,8 +22,6 @@ class SplitwellFrontendIntegrationTest
     with SplitwellFrontendTestUtil
     with FrontendLoginUtil {
 
-  private val splitwellDarPath = "daml/splitwell/.daml/dist/splitwell-current.dar"
-
   override def environmentDefinition: SpliceEnvironmentDefinition =
     EnvironmentDefinition
       .simpleTopology1Sv(this.getClass.getSimpleName)

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

@@ -22,8 +22,6 @@ class SplitwellUpgradeFrontendIntegrationTest
     with WalletTestUtil
     with SplitwellFrontendTestUtil {
 
-  private val darPath = "daml/splitwell/.daml/dist/splitwell-current.dar"
-
   override def environmentDefinition: SpliceEnvironmentDefinition =
     EnvironmentDefinition
       .simpleTopology1Sv(this.getClass.getSimpleName)
@@ -34,7 +32,7 @@ class SplitwellUpgradeFrontendIntegrationTest
           .setup(env)
         for {
           validator <- Seq(aliceValidatorBackend, bobValidatorBackend)
-        } validator.participantClient.upload_dar_unless_exists(darPath)
+        } validator.participantClient.upload_dar_unless_exists(splitwellDarPath)
       })
       // TODO(#8300) Consider removing this once domain config updates are less disruptive to carefully-timed batching tests.
       .withSequencerConnectionsFromScanDisabled()

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

@@ -27,8 +27,6 @@ class UpdateHistoryIntegrationTest
     with HasExecutionContext
     with UpdateHistoryTestUtil {
 
-  private val splitwellDarPath = "daml/splitwell/.daml/dist/splitwell-current.dar"
-
   override def environmentDefinition: SpliceEnvironmentDefinition =
     EnvironmentDefinition
       .simpleTopology1Sv(this.getClass.getSimpleName)

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

@@ -15,8 +15,6 @@ class WalletAppRewardsTimeBasedIntegrationTest
     with SplitwellTestUtil
     with TriggerTestUtil {
 
-  private val splitwellDarPath = "daml/splitwell/.daml/dist/splitwell-current.dar"
-
   override def environmentDefinition: SpliceEnvironmentDefinition =
     EnvironmentDefinition
       .simpleTopology1SvWithSimTime(this.getClass.getSimpleName)

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

@@ -29,8 +29,6 @@ class WalletExpirationsIntegrationTest
     with SplitwellTestUtil
     with TriggerTestUtil {
 
-  private val splitwellDarPath = "daml/splitwell/.daml/dist/splitwell-current.dar"
-
   override def environmentDefinition: SpliceEnvironmentDefinition =
     EnvironmentDefinition
       .simpleTopology1Sv(this.getClass.getSimpleName)

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

@@ -49,8 +49,6 @@ class WalletManualRoundsIntegrationTest
     with SplitwellTestUtil
     with TriggerTestUtil {
 
-  private val splitwellDarPath = "daml/splitwell/.daml/dist/splitwell-current.dar"
-
   override def environmentDefinition: SpliceEnvironmentDefinition =
     EnvironmentDefinition
       .simpleTopology1Sv(this.getClass.getSimpleName)

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

@@ -31,8 +31,6 @@ class WalletTimeBasedIntegrationTest
     with SplitwellTestUtil
     with TriggerTestUtil {
 
-  private val splitwellDarPath = "daml/splitwell/.daml/dist/splitwell-current.dar"
-
   override def environmentDefinition: SpliceEnvironmentDefinition =
     EnvironmentDefinition
       .simpleTopology1SvWithSimTime(this.getClass.getSimpleName)

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

@@ -49,8 +49,6 @@ class WalletTxLogIntegrationTest
     with ExternallySignedPartyTestUtil
     with TriggerTestUtil {
 
-  private val splitwellDarPath = "daml/splitwell/.daml/dist/splitwell-current.dar"
-
   private val amuletPrice = BigDecimal(0.75).setScale(10)
 
   override lazy val sanityChecksIgnoredRootCreates = Seq(