Avoid using the same database in tests that start a local validator participant (#3177)

Fixes DACH-NY/cn-test-failures#6394

...but also does some refactoring to make it more ergonomic and (hopefully) a bit less error-prone to write tests that use a throwaway validator participant.

Signed-off-by: Martin Florian <[email protected]>

Author: martinflorian-da

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

@@ -671,17 +671,6 @@ object ConfigTransforms {
     )
   }
 
-  def bumpSelfHostedParticipantPortsBy(bump: Int): ConfigTransform = {
-    val transforms = Seq(
-      updateAllValidatorConfigs { case (name, config) =>
-        if (name.startsWith("sv")) config
-        else
-          config.focus(_.participantClient).modify(portTransform(bump, _))
-      }
-    )
-    transforms.foldLeft((c: SpliceConfig) => c)((f, tf) => f compose tf)
-  }
-
   def withBftSequencer(config: SvAppBackendConfig): SvAppBackendConfig =
     config
       .focus(_.localSynchronizerNode)

apps/app/src/test/resources/include/self-hosted-sv-participant-postgres-storage.conf

@@ -1,6 +1,6 @@
 package org.lfdecentralizedtrust.splice.integration
 
-import better.files.{File, Resource}
+import better.files.{File, Resource, *}
 import com.digitalasset.canton.admin.api.client.data.User
 import com.digitalasset.canton.config.CantonRequireTypes.InstanceName
 import com.digitalasset.canton.config.RequireTypes.{NonNegativeLong, NonNegativeNumeric}
@@ -80,6 +80,14 @@ case class EnvironmentDefinition(
       .copy(setup = _ => ())
   }
 
+  def withStandardSetup: EnvironmentDefinition =
+    this
+      .withAllocatedUsers()
+      .withInitializedNodes()
+      .withTrafficTopupsEnabled
+      .withInitialPackageVersions
+      .withEagerAppActivityMarkerConversion
+
   def withAllocatedUsers(
       extraIgnoredSvPrefixes: Seq[String] = Seq.empty,
       extraIgnoredValidatorPrefixes: Seq[String] = Seq.empty,
@@ -478,21 +486,29 @@ object EnvironmentDefinition extends CommonAppInstanceReferences {
 
   // Prefer this to `4Svs` for better test performance (unless your really need >1 SV of course).
   def simpleTopology1Sv(testName: String): EnvironmentDefinition = {
-    fromResources(Seq("simple-topology-1sv.conf"), testName)
-      .withAllocatedUsers()
-      .withInitializedNodes()
-      .withTrafficTopupsEnabled
-      .withInitialPackageVersions
-      .withEagerAppActivityMarkerConversion
+    fromResources(Seq("simple-topology-1sv.conf"), testName).withStandardSetup
   }
 
   def simpleTopology4Svs(testName: String): EnvironmentDefinition = {
-    fromResources(Seq("simple-topology.conf"), testName)
-      .withAllocatedUsers()
-      .withInitializedNodes()
-      .withTrafficTopupsEnabled
-      .withInitialPackageVersions
-      .withEagerAppActivityMarkerConversion
+    fromResources(Seq("simple-topology.conf"), testName).withStandardSetup
+  }
+
+  def simpleTopology1SvWithLocalValidator(testName: String): EnvironmentDefinition = {
+    val testResourcesPath: File = "apps" / "app" / "src" / "test" / "resources"
+    fromFiles(
+      testName,
+      testResourcesPath / "simple-topology-1sv.conf",
+      testResourcesPath / "local-validator-node" / "validator-app" / "app.conf",
+    ).withStandardSetup.withManualStart
+  }
+
+  def simpleTopology4SvsWithLocalValidator(testName: String): EnvironmentDefinition = {
+    val testResourcesPath: File = "apps" / "app" / "src" / "test" / "resources"
+    fromFiles(
+      testName,
+      testResourcesPath / "simple-topology.conf",
+      testResourcesPath / "local-validator-node" / "validator-app" / "app.conf",
+    ).withStandardSetup.withManualStart
   }
 
   def simpleTopology1SvWithSimTime(testName: String): EnvironmentDefinition =

apps/app/src/test/resources/include/self-hosted-validator-disable-json-api.conf

@@ -1,28 +1,35 @@
 package org.lfdecentralizedtrust.splice.integration.tests
 
-import better.files.File
 import org.apache.pekko.http.scaladsl.model.Uri
-import org.lfdecentralizedtrust.splice.config.ConfigTransforms
 import org.lfdecentralizedtrust.splice.integration.EnvironmentDefinition
 import org.lfdecentralizedtrust.splice.integration.tests.SpliceTests.IntegrationTest
-import org.lfdecentralizedtrust.splice.util.{ProcessTestUtil, WalletTestUtil}
+import org.lfdecentralizedtrust.splice.util.{ProcessTestUtil, StandaloneCanton, WalletTestUtil}
 import org.lfdecentralizedtrust.splice.unit.http.{
   SystemProperties,
   SystemPropertiesSupport,
   TinyProxySupport,
 }
 
-import scala.concurrent.duration.*
-
 class ValidatorProxyIntegrationTest
     extends IntegrationTest
     with WalletTestUtil
     with ProcessTestUtil
+    with StandaloneCanton
     with TinyProxySupport
     with SystemPropertiesSupport {
+
+  override def dbsSuffix = "validator_proxy"
+  val dbName = s"participant_alice_validator_${dbsSuffix}"
+  override def usesDbs = Seq(dbName) ++ super.usesDbs
+
+  // Can sometimes be unhappy when doing funky `withCanton` things; disabling them for simplicity
   override protected def runTokenStandardCliSanityCheck: Boolean = false
   override protected def runUpdateHistorySanityCheck: Boolean = false
 
+  override def environmentDefinition: SpliceEnvironmentDefinition = {
+    EnvironmentDefinition.simpleTopology1SvWithLocalValidator(this.getClass.getSimpleName)
+  }
+
   "validator should start and tap, using http forward proxy" in { implicit env =>
     val host = "127.0.0.1"
     initDsoWithSv1Only()
@@ -37,22 +44,19 @@ class ValidatorProxyIntegrationTest
           .set("https.nonProxyHosts", "")
       withProperties(props) {
         withCanton(
-          cantonArgs,
-          cantonExtraConfig,
+          Seq(
+            testResourcesPath / "standalone-participant-extra.conf"
+          ),
+          Seq.empty,
           "validator-proxy-test",
+          "EXTRA_PARTICIPANT_ADMIN_USER" -> aliceValidatorLocalBackend.config.ledgerApiUser,
+          "EXTRA_PARTICIPANT_DB" -> dbName,
           "JAVA_TOOL_OPTIONS" -> props.toJvmOptionString,
         ) {
-          aliceValidatorBackend.start()
-          clue("Wait for validator initialization") {
-            // Need to wait for the participant node to startup for the user allocation to go through
-            eventuallySucceeds(timeUntilSuccess = 120.seconds) {
-              EnvironmentDefinition.withAllocatedValidatorUser(aliceValidatorBackend)
-            }
-            aliceValidatorBackend.waitForInitialization()
-          }
+          aliceValidatorLocalBackend.startSync()
           actAndCheck(
             "Onboard wallet user",
-            onboardWalletUser(aliceWalletClient, aliceValidatorBackend),
+            onboardWalletUser(aliceWalletClient, aliceValidatorLocalBackend),
           )(
             "We can tap and list",
             _ => {
@@ -75,12 +79,12 @@ class ValidatorProxyIntegrationTest
           ) shouldBe true
           proxy.proxiedConnectRequest(
             host,
-            aliceValidatorBackend.config.clientAdminApi.port.unwrap,
+            aliceValidatorLocalBackend.config.clientAdminApi.port.unwrap,
           ) shouldBe true
 
           proxy.proxiedConnectRequest(
             host,
-            aliceValidatorBackend.participantClient.config.ledgerApi.port.unwrap,
+            aliceValidatorLocalBackend.participantClient.config.ledgerApi.port.unwrap,
           ) shouldBe true
 
           val sequencerPort = Uri(
@@ -99,36 +103,4 @@ class ValidatorProxyIntegrationTest
       }
     }
   }
-
-  val includeTestResourcesPath: File = testResourcesPath / "include"
-
-  val cantonArgs: Seq[File] = Seq(
-    includeTestResourcesPath / "validator-participant.conf",
-    includeTestResourcesPath / "self-hosted-validator-disable-json-api.conf",
-    includeTestResourcesPath / "self-hosted-validator-participant-postgres-storage.conf",
-    includeTestResourcesPath / "storage-postgres.conf",
-  )
-  val cantonExtraConfig: Seq[String] =
-    Seq(
-      "canton.participants.validatorParticipant.ledger-api.port=7501",
-      "canton.participants.validatorParticipant.admin-api.port=7502",
-    )
-  val ParticipantLedgerPort = 7501
-  val ParticipantAdminPort = 7502
-  override protected def extraPortsToWaitFor: Seq[(String, Int)] = Seq(
-    ("ParticipantLedgerApi", ParticipantLedgerPort),
-    ("ParticipantAdminApi", ParticipantAdminPort),
-  )
-
-  override def environmentDefinition: SpliceEnvironmentDefinition = {
-    EnvironmentDefinition
-      .simpleTopology1Sv(this.getClass.getSimpleName)
-      .withPreSetup(_ => ())
-      .addConfigTransforms((_, conf) =>
-        ConfigTransforms.bumpSelfHostedParticipantPortsBy(2000)(conf)
-      )
-      // Do not allocate validator users here, as we deal with all of them manually
-      .withAllocatedUsers(extraIgnoredValidatorPrefixes = Seq(""))
-      .withManualStart
-  }
 }