Fix more tests by enabling the append-only schema by default

CHANGELOG_BEGIN CHANGELOG_END
digital-asset · Oct 15, 2021 · d140783 · d140783
1 parent 14fad76
commit d140783
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 9 deletions.
diff --git a/ledger-service/http-json-testing/src/main/scala/com/daml/http/util/SandboxTestLedger.scala b/ledger-service/http-json-testing/src/main/scala/com/daml/http/util/SandboxTestLedger.scala
@@ -41,7 +41,6 @@ trait SandboxTestLedger extends SandboxNextFixture {
     scenario = scenario,
     engineMode = SandboxConfig.EngineMode.Dev,
     seeding = Some(Seeding.Weak),
-    enableAppendOnlySchema = true,
   )
 
   def clientCfg(token: Option[String], testName: String): LedgerClientConfiguration =

diff --git a/ledger/ledger-api-test-tool-on-canton/BUILD.bazel b/ledger/ledger-api-test-tool-on-canton/BUILD.bazel
@@ -72,9 +72,6 @@ conformance_test(
     ],
     runner = "@//bazel_tools/client_server/runner_with_port_check",
     server = ":canton-test-runner-with-dependencies",
-    server_args = [
-        "--enable-append-only-schema",
-    ],
     test_tool_args = [
         "--verbose",
         "--concurrent-test-runs=1",  # lowered from default #procs to reduce flakes - details in https://github.com/digital-asset/daml/issues/7316

diff --git a/ledger/ledger-api-test-tool-on-canton/canton.conf b/ledger/ledger-api-test-tool-on-canton/canton.conf
@@ -44,6 +44,8 @@ canton {
 
       crypto.provider = tink
 
+      ledger-api.enable-append-only-schema = true
+
       ledger-api.port = 5011
       admin-api.port = 5012
     }
@@ -61,6 +63,8 @@ canton {
 
       crypto.provider = tink
 
+      ledger-api.enable-append-only-schema = true
+
       ledger-api.port = 5021
       admin-api.port = 5022
     }
@@ -78,6 +82,8 @@ canton {
 
       crypto.provider = tink
 
+      ledger-api.enable-append-only-schema = true
+
       ledger-api.port = 5031
       admin-api.port = 5032
     }
@@ -95,6 +101,8 @@ canton {
 
       crypto.provider = tink
 
+      ledger-api.enable-append-only-schema = true
+
       ledger-api.port = 5041
       admin-api.port = 5042
     }

diff --git a/...ate/kvutils/app/src/main/scala/com/daml/ledger/participant/state/kvutils/app/Config.scala b/...ate/kvutils/app/src/main/scala/com/daml/ledger/participant/state/kvutils/app/Config.scala
@@ -84,7 +84,7 @@ object Config {
       metricsReporter = None,
       metricsReportingInterval = Duration.ofSeconds(10),
       allowedLanguageVersions = LanguageVersion.StableVersions,
-      enableAppendOnlySchema = false,
+      enableAppendOnlySchema = true,
       enableMutableContractStateCache = false,
       enableInMemoryFanOutForLedgerApi = false,
       maxDeduplicationDuration = None,

diff --git a/ledger/sandbox-classic/src/test/lib/scala/platform/sandbox/services/SandboxFixture.scala b/ledger/sandbox-classic/src/test/lib/scala/platform/sandbox/services/SandboxFixture.scala
@@ -20,7 +20,7 @@ trait SandboxFixture extends AbstractSandboxFixture with SuiteResource[(SandboxS
   self: Suite =>
 
   // TODO append-only: remove after the mutating schema is removed
-  protected def enableAppendOnlySchema: Boolean = false
+  protected def enableAppendOnlySchema: Boolean = true
 
   override protected def config: SandboxConfig =
     super.config.copy(

diff --git a/ledger/sandbox-common/src/main/scala/platform/sandbox/config/SandboxConfig.scala b/ledger/sandbox-common/src/main/scala/platform/sandbox/config/SandboxConfig.scala
@@ -145,7 +145,7 @@ object SandboxConfig {
       engineMode = EngineMode.Stable,
       managementServiceTimeout = DefaultManagementServiceTimeout,
       sqlStartMode = Some(DefaultSqlStartupMode),
-      enableAppendOnlySchema = false,
+      enableAppendOnlySchema = true,
       enableCompression = false,
       enableSelfServiceErrorCodes = false,
     )

diff --git a/ledger/sandbox-common/src/test/lib/scala/platform/sandbox/AbstractSandboxFixture.scala b/ledger/sandbox-common/src/test/lib/scala/platform/sandbox/AbstractSandboxFixture.scala
@@ -70,7 +70,6 @@ trait AbstractSandboxFixture extends AkkaBeforeAndAfterAll {
       seeding = Some(Seeding.Weak),
       engineMode = SandboxConfig.EngineMode.Dev,
       authService = authService,
-      enableAppendOnlySchema = true,
     )
 
   protected def packageFiles: List[File] = List(darFile)

diff --git a/...andbox-common/src/test/lib/scala/platform/sandbox/services/reset/ResetServiceITBase.scala b/...andbox-common/src/test/lib/scala/platform/sandbox/services/reset/ResetServiceITBase.scala
@@ -81,7 +81,7 @@ abstract class ResetServiceITBase
   override def timeLimit: Span = scaled(30.seconds)
 
   override protected def config: SandboxConfig =
-    super.config.copy(ledgerIdMode = LedgerIdMode.Dynamic)
+    super.config.copy(ledgerIdMode = LedgerIdMode.Dynamic, enableAppendOnlySchema = true)
 
   protected implicit val ec: ExecutionContext = ExecutionContext.global