Update Splice from CCI (#176)

Signed-off-by: DA Automation <[email protected]> Co-authored-by: DA Automation <[email protected]>
hyperledger-labs · Jan 13, 2025 · 0867f45 · 0867f45
1 parent 08fc692
commit 0867f45
Show file tree

Hide file tree

Showing 58 changed files with 930 additions and 899 deletions.
diff --git a/LATEST_RELEASE b/LATEST_RELEASE
@@ -1 +1 @@
-0.3.4
+0.3.5
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.3.5
+0.3.6
diff --git a/apps/app/src/main/scala/org/lfdecentralizedtrust/splice/config/SpliceConfig.scala b/apps/app/src/main/scala/org/lfdecentralizedtrust/splice/config/SpliceConfig.scala
@@ -9,12 +9,6 @@ import cats.syntax.either.*
 import cats.syntax.functor.*
 import org.lfdecentralizedtrust.splice.auth.AuthConfig
 import org.lfdecentralizedtrust.splice.environment.DarResources
-import org.lfdecentralizedtrust.splice.http.v0.definitions.{
-  AppConfiguration,
-  Domain,
-  ReleaseConfiguration,
-  Timespan,
-}
 import org.lfdecentralizedtrust.splice.http.UrlValidator
 import org.lfdecentralizedtrust.splice.scan.admin.api.client.BftScanConnection.BftScanClientConfig
 import org.lfdecentralizedtrust.splice.scan.config.{
@@ -590,16 +584,6 @@ object SpliceConfig {
       deriveReader[ValidatorSynchronizerConfig]
     implicit val offsetDateTimeConfigurationReader: ConfigReader[java.time.OffsetDateTime] =
       implicitly[ConfigReader[String]].map(java.time.OffsetDateTime.parse)
-    implicit val timespanConfigurationReader: ConfigReader[Timespan] = deriveReader[Timespan]
-    implicit val domainConfigurationReader: ConfigReader[Domain] = deriveReader[Domain]
-    implicit val releaseConfigurationReader: ConfigReader[ReleaseConfiguration] =
-      deriveReader[ReleaseConfiguration]
-    implicit val appConfigurationReader: ConfigReader[AppConfiguration] =
-      deriveReader[AppConfiguration]
-    implicit val initialRegisteredAppReader: ConfigReader[InitialRegisteredApp] =
-      deriveReader[InitialRegisteredApp]
-    implicit val initialInstalledAppReader: ConfigReader[InitialInstalledApp] =
-      deriveReader[InitialInstalledApp]
     implicit val transferPreapprovalConfigReader: ConfigReader[TransferPreapprovalConfig] =
       deriveReader[TransferPreapprovalConfig].emap { conf =>
         Either.cond(
@@ -851,16 +835,6 @@ object SpliceConfig {
       deriveWriter[ValidatorSynchronizerConfig]
     implicit val offsetDateTimeConfigurationWriter: ConfigWriter[java.time.OffsetDateTime] =
       implicitly[ConfigWriter[String]].contramap(_.toString)
-    implicit val timespanConfigurationWriter: ConfigWriter[Timespan] = deriveWriter[Timespan]
-    implicit val domainConfigurationWriter: ConfigWriter[Domain] = deriveWriter[Domain]
-    implicit val releaseConfigurationWriter: ConfigWriter[ReleaseConfiguration] =
-      deriveWriter[ReleaseConfiguration]
-    implicit val appConfigurationWriter: ConfigWriter[AppConfiguration] =
-      deriveWriter[AppConfiguration]
-    implicit val initialRegisteredAppWriter: ConfigWriter[InitialRegisteredApp] =
-      deriveWriter[InitialRegisteredApp]
-    implicit val initialInstalledAppWriter: ConfigWriter[InitialInstalledApp] =
-      deriveWriter[InitialInstalledApp]
     implicit val transferPreapprovalConfigWriter: ConfigWriter[TransferPreapprovalConfig] =
       deriveWriter[TransferPreapprovalConfig]
     implicit val migrateValidatorPartyConfigWriter: ConfigWriter[MigrateValidatorPartyConfig] =

diff --git a/apps/app/src/test/resources/include/scans/_scan.conf b/apps/app/src/test/resources/include/scans/_scan.conf
@@ -9,7 +9,7 @@
         serverName = ${?POSTGRES_HOST}
         portNumber = "5432"
         portNumber = ${?POSTGRES_PORT}
-        databaseName = "cn_apps"
+        databaseName = "splice_apps"
         user = "canton"
         user = ${?POSTGRES_USER}
         password = "supersafe"

diff --git a/apps/app/src/test/resources/include/splitwell-apps/provider-splitwell-backend.conf b/apps/app/src/test/resources/include/splitwell-apps/provider-splitwell-backend.conf
@@ -9,7 +9,7 @@ providerSplitwellBackend {
         serverName = ${?POSTGRES_HOST}
         portNumber = "5432"
         portNumber = ${?POSTGRES_PORT}
-        databaseName = "cn_apps"
+        databaseName = "splice_apps"
         user = "canton"
         user = ${?POSTGRES_USER}
         password = "supersafe"

diff --git a/apps/app/src/test/resources/include/svs/_sv.conf b/apps/app/src/test/resources/include/svs/_sv.conf
@@ -9,7 +9,7 @@
         serverName = ${?POSTGRES_HOST}
         portNumber = "5432"
         portNumber = ${?POSTGRES_PORT}
-        databaseName = "cn_apps"
+        databaseName = "splice_apps"
         user = "canton"
         user = ${?POSTGRES_USER}
         password = "supersafe"

diff --git a/apps/app/src/test/resources/include/validators/_validator.conf b/apps/app/src/test/resources/include/validators/_validator.conf
@@ -8,7 +8,7 @@
         serverName = ${?POSTGRES_HOST}
         portNumber = "5432"
         portNumber = ${?POSTGRES_PORT}
-        databaseName = "cn_apps"
+        databaseName = "splice_apps"
         user = "canton"
         user = ${?POSTGRES_USER}
         password = "supersafe"

diff --git a/apps/app/src/test/resources/local-sv-node/scan-app/app.conf b/apps/app/src/test/resources/local-sv-node/scan-app/app.conf
@@ -30,7 +30,7 @@ canton {
             serverName = ${?POSTGRES_HOST}
             portNumber = "5432"
             portNumber = ${?POSTGRES_PORT}
-            databaseName = "cn_apps"
+            databaseName = "splice_apps"
             user = "canton"
             user = ${?POSTGRES_USER}
             password = "supersafe"

diff --git a/apps/app/src/test/resources/local-sv-node/sv-app/app.conf b/apps/app/src/test/resources/local-sv-node/sv-app/app.conf
@@ -9,7 +9,7 @@ _sv {
         serverName = ${?POSTGRES_HOST}
         portNumber = "5432"
         portNumber = ${?POSTGRES_PORT}
-        databaseName = "cn_apps"
+        databaseName = "splice_apps"
         user = "canton"
         user = ${?POSTGRES_USER}
         password = "supersafe"

diff --git a/apps/app/src/test/resources/local-sv-node/validator-app/app.conf b/apps/app/src/test/resources/local-sv-node/validator-app/app.conf
@@ -10,7 +10,7 @@ canton {
             serverName = ${?POSTGRES_HOST}
             portNumber = "5432"
             portNumber = ${?POSTGRES_PORT}
-            databaseName = "cn_apps"
+            databaseName = "splice_apps"
             user = "canton"
             user = ${?POSTGRES_USER}
             password = "supersafe"

diff --git a/apps/app/src/test/resources/local-validator-node/validator-app/app.conf b/apps/app/src/test/resources/local-validator-node/validator-app/app.conf
@@ -10,7 +10,7 @@ canton {
             serverName = ${?POSTGRES_HOST}
             portNumber = "5432"
             portNumber = ${?POSTGRES_PORT}
-            databaseName = "cn_apps"
+            databaseName = "splice_apps"
             user = "canton"
             user = ${?POSTGRES_USER}
             password = "supersafe"

diff --git a/.../org/lfdecentralizedtrust/splice/integration/tests/SplitwellFrontendIntegrationTest.scala b/.../org/lfdecentralizedtrust/splice/integration/tests/SplitwellFrontendIntegrationTest.scala
@@ -82,6 +82,9 @@ class SplitwellFrontendIntegrationTest
 
       withFrontEnd("aliceSplitwell") { implicit webDriver =>
         eventuallyClickOn(className("add-user-link"))
+        eventually() {
+          findAll(className("balances-table-row")).toSeq should have length 2
+        }
 
         inside(find(className("enter-payment-amount-field"))) { case Some(field) =>
           field.underlying.click()
@@ -221,6 +224,9 @@ class SplitwellFrontendIntegrationTest
 
       withFrontEnd("aliceSplitwell") { implicit webDriver =>
         eventuallyClickOn(className("add-user-link"))
+        eventually() {
+          findAll(className("balances-table-row")).toSeq should have length 1
+        }
         addTeamLunch(1000)
       }
 

diff --git a/.../lfdecentralizedtrust/splice/integration/tests/ValidatorReonboardingIntegrationTest.scala b/.../lfdecentralizedtrust/splice/integration/tests/ValidatorReonboardingIntegrationTest.scala
@@ -43,7 +43,7 @@ class ValidatorReonboardingIntegrationTest
     Seq(
       "participant_alice_validator",
       "participant_alice_validator_reonboard_new",
-      "cn_apps_reonboard",
+      "splice_apps_reonboard",
     ) ++ super.usesDbs
 
   // Runs against a temporary Canton instance.
@@ -111,7 +111,7 @@ class ValidatorReonboardingIntegrationTest
                         config = c.config
                           .withValue(
                             "properties.databaseName",
-                            ConfigValueFactory.fromAnyRef("cn_apps_reonboard"),
+                            ConfigValueFactory.fromAnyRef("splice_apps_reonboard"),
                           )
                       )
                     case _ => throw new IllegalArgumentException("Only Postgres is supported")