Drop feature flag for v0 cid support (#12522)

I’ve kept it on the same test infrastructure that we used before that can test both ways since it seems nicer to keep this consistent with v1. changelog_begin changelog_end Breaks-protobuf: true
digital-asset · Jan 21, 2022 · b843117 · b843117
1 parent 73277f4
commit b843117
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 22 deletions.
diff --git a/ledger-api/grpc-definitions/com/daml/ledger/api/v1/experimental_features.proto b/ledger-api/grpc-definitions/com/daml/ledger/api/v1/experimental_features.proto
@@ -76,13 +76,7 @@ enum CommandDeduplicationType {
 
 // See `daml-lf/spec/contract-id.rst` for more information on contract ID formats.
 message ExperimentalContractIds {
-  ContractIdV0Support v0 = 1;
-  ContractIdV1Support v1 = 2;
-
-  enum ContractIdV0Support {
-    NOT_SUPPORTED = 0;
-    SUPPORTED = 1;
-  }
+  ContractIdV1Support v1 = 1;
 
   enum ContractIdV1Support {
     // Contract IDs must be suffixed.

diff --git a/...edger-api-test-tool/src/main/scala/com/daml/ledger/api/testtool/suites/ContractIdIT.scala b/...edger-api-test-tool/src/main/scala/com/daml/ledger/api/testtool/suites/ContractIdIT.scala
@@ -30,19 +30,12 @@ import scala.util.{Failure, Success, Try}
 // - Distributed ledger implementations (e.g. Canton) must reject non-suffixed CID
 final class ContractIdIT extends LedgerTestSuite {
   List(
-    TestConfiguration(
-      description = "v0",
-      example = v0Cid,
-      accepted = true,
-      isSupported = features => features.contractIds.v0.isSupported,
-      disabledReason = "V0 contract IDs are not supported",
-    ),
+    // Support for v0 contract ids existed only in sandbox-classic in
+    // SDK 1.18 and older and has been dropped completely.
     TestConfiguration(
       description = "v0",
       example = v0Cid,
       accepted = false,
-      isSupported = features => features.contractIds.v0.isNotSupported,
-      disabledReason = "V0 contract IDs are supported",
     ),
     TestConfiguration(
       description = "non-suffixed v1",

diff --git a/...ate/kvutils/app/src/main/scala/com/daml/ledger/participant/state/kvutils/app/Runner.scala b/...ate/kvutils/app/src/main/scala/com/daml/ledger/participant/state/kvutils/app/Runner.scala
@@ -220,8 +220,7 @@ final class Runner[T <: ReadWriteService, Extra](
                       maxDeduplicationDurationEnforced = true,
                     ),
                     contractIdFeatures = ExperimentalContractIds.of(
-                      v0 = ExperimentalContractIds.ContractIdV0Support.NOT_SUPPORTED,
-                      v1 = ExperimentalContractIds.ContractIdV1Support.NON_SUFFIXED,
+                      v1 = ExperimentalContractIds.ContractIdV1Support.NON_SUFFIXED
                     ),
                   ),
                 ).acquire()

diff --git a/ledger/sandbox-on-x/src/main/scala/com/daml/ledger/sandbox/SandboxOnXRunner.scala b/ledger/sandbox-on-x/src/main/scala/com/daml/ledger/sandbox/SandboxOnXRunner.scala
@@ -248,8 +248,7 @@ object SandboxOnXRunner {
           maxDeduplicationDurationEnforced = false,
         ),
         contractIdFeatures = ExperimentalContractIds.of(
-          v0 = ExperimentalContractIds.ContractIdV0Support.NOT_SUPPORTED,
-          v1 = ExperimentalContractIds.ContractIdV1Support.NON_SUFFIXED,
+          v1 = ExperimentalContractIds.ContractIdV1Support.NON_SUFFIXED
         ),
       ),
     )

diff --git a/ledger/sandbox/src/main/scala/platform/sandboxnext/Runner.scala b/ledger/sandbox/src/main/scala/platform/sandboxnext/Runner.scala
@@ -287,8 +287,7 @@ class Runner(config: SandboxConfig) extends ResourceOwner[Port] {
               maxDeduplicationDurationEnforced = true,
             ),
             contractIdFeatures = ExperimentalContractIds.of(
-              v0 = ExperimentalContractIds.ContractIdV0Support.NOT_SUPPORTED,
-              v1 = ExperimentalContractIds.ContractIdV1Support.NON_SUFFIXED,
+              v1 = ExperimentalContractIds.ContractIdV1Support.NON_SUFFIXED
             ),
           ),
         )