Move DeduplicationPeriod to ledger-api-domain [KVL-1047] (#10590)

* Move `DeduplicationPeriod` to ledger-api-domain so that it ca be reused and passed down from the ledger-api-client to into the v2.SubmitterInfo CHANGELOG_BEGIN participant-state - move `DeduplicationPeriod` to ledger-api-domain CHANGELOG_END * Revert unrelated changes
digital-asset · Aug 24, 2021 · 62de185 · 62de185
1 parent 8ba2e9c
commit 62de185
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 4 deletions.
diff --git a/ledger/ledger-api-domain/BUILD.bazel b/ledger/ledger-api-domain/BUILD.bazel
@@ -20,6 +20,7 @@ da_scala_library(
         "//daml-lf/data",
         "//daml-lf/transaction",
         "//ledger/ledger-configuration",
+        "//ledger/ledger-offset",
         "//libs-scala/logging-entries",
     ],
 )

diff --git a/...cipant/state/v2/DeduplicationPeriod.scala → ...sset/ledger/api/DeduplicationPeriod.scala b/...cipant/state/v2/DeduplicationPeriod.scala → ...sset/ledger/api/DeduplicationPeriod.scala
@@ -1,7 +1,7 @@
 // Copyright (c) 2021 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package com.daml.ledger.participant.state.v2
+package com.daml.ledger.api
 
 import java.time.Duration
 

diff --git a/ledger/ledger-api-domain/src/main/scala/com/digitalasset/ledger/api/domain.scala b/ledger/ledger-api-domain/src/main/scala/com/digitalasset/ledger/api/domain.scala
@@ -200,7 +200,7 @@ object domain {
       *
       * This means that the underlying ledger and its validation logic
       * considered the transaction potentially invalid. This can be due to a bug
-      * in the submission or validiation logic, or due to malicious behaviour.
+      * in the submission or validation logic, or due to malicious behaviour.
       */
     final case class Disputed(description: String) extends RejectionReason
 

diff --git a/...egration-api/src/main/scala/platform/apiserver/execution/StoreBackedCommandExecutor.scala b/...egration-api/src/main/scala/platform/apiserver/execution/StoreBackedCommandExecutor.scala
@@ -6,6 +6,7 @@ package com.daml.platform.apiserver.execution
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicLong
 
+import com.daml.ledger.api.DeduplicationPeriod
 import com.daml.ledger.api.domain.{Commands => ApiCommands}
 import com.daml.ledger.configuration.Configuration
 import com.daml.ledger.participant.state.index.v2.{ContractStore, IndexPackagesService}
@@ -79,7 +80,7 @@ private[apiserver] final class StoreBackedCommandExecutor(
               commands.actAs.toList,
               commands.applicationId.unwrap,
               commands.commandId.unwrap,
-              state.DeduplicationPeriod.DeduplicationDuration(commands.deduplicationDuration),
+              DeduplicationPeriod.DeduplicationDuration(commands.deduplicationDuration),
               commands.submissionId.unwrap,
               ledgerConfiguration,
             ),

diff --git a/ledger/participant-state/BUILD.bazel b/ledger/participant-state/BUILD.bazel
@@ -29,6 +29,7 @@ da_scala_library(
         "//daml-lf/transaction",
         "//language-support/scala/bindings",
         "//ledger-api/grpc-definitions:ledger_api_proto_scala",
+        "//ledger/ledger-api-domain",
         "//ledger/ledger-api-health",
         "//ledger/ledger-configuration",
         "//ledger/ledger-configuration/protobuf:ledger_configuration_proto_java",

diff --git a/...ant-state/src/main/scala/com/daml/ledger/participant/state/v2/AdaptedV1WriteService.scala b/...ant-state/src/main/scala/com/daml/ledger/participant/state/v2/AdaptedV1WriteService.scala
@@ -7,6 +7,7 @@ import java.time.Instant
 import java.util.concurrent.CompletionStage
 
 import com.daml.daml_lf_dev.DamlLf
+import com.daml.ledger.api.DeduplicationPeriod
 import com.daml.ledger.api.health.HealthStatus
 import com.daml.ledger.configuration.Configuration
 import com.daml.ledger.offset.Offset

diff --git a/...articipant-state/src/main/scala/com/daml/ledger/participant/state/v2/CompletionInfo.scala b/...articipant-state/src/main/scala/com/daml/ledger/participant/state/v2/CompletionInfo.scala
@@ -3,6 +3,7 @@
 
 package com.daml.ledger.participant.state.v2
 
+import com.daml.ledger.api.DeduplicationPeriod
 import com.daml.lf.data.Ref
 import com.daml.logging.entries.{LoggingValue, ToLoggingValue}
 

diff --git a/...participant-state/src/main/scala/com/daml/ledger/participant/state/v2/SubmitterInfo.scala b/...participant-state/src/main/scala/com/daml/ledger/participant/state/v2/SubmitterInfo.scala
@@ -3,6 +3,7 @@
 
 package com.daml.ledger.participant.state.v2
 
+import com.daml.ledger.api.DeduplicationPeriod
 import com.daml.ledger.configuration.Configuration
 import com.daml.lf.data.Ref
 import com.daml.logging.entries.{LoggingValue, ToLoggingValue}

diff --git a/ledger/participant-state/src/main/scala/com/daml/ledger/participant/state/v2/Update.scala b/ledger/participant-state/src/main/scala/com/daml/ledger/participant/state/v2/Update.scala
@@ -6,6 +6,7 @@ package com.daml.ledger.participant.state.v2
 import java.time.Duration
 
 import com.daml.daml_lf_dev.DamlLf
+import com.daml.ledger.api.DeduplicationPeriod
 import com.daml.ledger.configuration.Configuration
 import com.daml.ledger.grpc.GrpcStatuses
 import com.daml.lf.data.Ref

diff --git a/...rc/test/suite/scala/platform/sandbox/stores/ledger/TransactionTimeModelComplianceIT.scala b/...rc/test/suite/scala/platform/sandbox/stores/ledger/TransactionTimeModelComplianceIT.scala
@@ -8,6 +8,7 @@ import java.util.UUID
 
 import akka.stream.scaladsl.Sink
 import com.daml.api.util.TimeProvider
+import com.daml.ledger.api.DeduplicationPeriod
 import com.daml.ledger.api.domain.LedgerId
 import com.daml.ledger.api.testing.utils.{
   AkkaBeforeAndAfterAll,
@@ -96,7 +97,7 @@ class TransactionTimeModelComplianceIT
       actAs = List(Ref.Party.assertFromString("submitter")),
       applicationId = Ref.ApplicationId.assertFromString("appId"),
       commandId = Ref.CommandId.assertFromString(commandId + UUID.randomUUID().toString),
-      deduplicationPeriod = state.DeduplicationPeriod.DeduplicationDuration(JDuration.ZERO),
+      deduplicationPeriod = DeduplicationPeriod.DeduplicationDuration(JDuration.ZERO),
       submissionId = Ref.SubmissionId.assertFromString(submissionId),
       ledgerConfiguration = configuration,
     )