Skip to content

Commit 0a5abee

Browse files
[Engine] Make ContractStateMachine an abstract class
1 parent c8a0078 commit 0a5abee

File tree

5 files changed

+213
-100
lines changed

5 files changed

+213
-100
lines changed

sdk/canton/community/base/src/main/scala/com/digitalasset/canton/logging/pretty/PrettyInstances.scala

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import com.digitalasset.canton.util.{ErrorUtil, HexString}
1717
import com.digitalasset.canton.{LedgerUserId, LfPartyId, LfTimestamp, LfVersioned, Uninhabited}
1818
import com.digitalasset.daml.lf.data.Ref
1919
import com.digitalasset.daml.lf.data.Ref.{DottedName, PackageId, QualifiedName}
20-
import com.digitalasset.daml.lf.transaction.ContractStateMachine.ActiveLedgerState
2120
import com.digitalasset.daml.lf.transaction.TransactionErrors.*
2221
import com.digitalasset.daml.lf.transaction.{CreationTime, Versioned}
2322
import com.digitalasset.daml.lf.value.Value
@@ -308,13 +307,6 @@ trait PrettyInstances {
308307
prettyOfClass[DuplicateContractId](unnamedParam(_.contractId)).treeOf(e)
309308
}
310309

311-
implicit def prettyActiveLedgerState[T: Pretty]: Pretty[ActiveLedgerState[T]] =
312-
prettyOfClass[ActiveLedgerState[T]](
313-
param("locallyCreatedThisTimeline", _.locallyCreatedThisTimeline),
314-
param("consumedBy", _.consumedBy),
315-
param("localActiveKeys", _.localActiveKeys),
316-
)
317-
318310
implicit val prettyPort: Pretty[Port] = prettyOfString(_.unwrap.toString)
319311

320312
implicit val prettyRefinedNumeric: Pretty[RefinedNumeric[?]] = prettyOfString(_.unwrap.toString)

sdk/daml-lf/interpreter/src/test/scala/com/digitalasset/daml/lf/speedy/SpeedyTestLib.scala

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ import com.digitalasset.daml.lf.speedy.Speedy.UpdateMachine
1616
import com.digitalasset.daml.lf.stablepackages.StablePackages
1717
import com.digitalasset.daml.lf.testing.parser.ParserParameters
1818
import com.digitalasset.daml.lf.transaction.{
19+
ContractStateMachine,
1920
FatContractInstance,
2021
GlobalKey,
2122
GlobalKeyWithMaintainers,
23+
NodeId,
2224
SubmittedTransaction,
2325
}
2426
import com.digitalasset.daml.lf.validation.{Validation, ValidationError}
@@ -204,10 +206,12 @@ private[speedy] object SpeedyTestLib {
204206
key: GlobalKey,
205207
): UpdateMachine = {
206208
machine.ptx = machine.ptx.copy(
207-
contractState = machine.ptx.contractState.copy(
208-
locallyCreated = machine.ptx.contractState.locallyCreated + contractId,
209-
activeState = machine.ptx.contractState.activeState.createKey(key, contractId),
210-
)
209+
contractState = machine.ptx.contractState
210+
.asInstanceOf[ContractStateMachine.StateImpl[NodeId]]
211+
.copy(
212+
locallyCreated = machine.ptx.contractState.locallyCreated + contractId,
213+
activeState = machine.ptx.contractState.activeState.createKey(key, contractId),
214+
)
211215
)
212216
machine
213217
}

sdk/daml-lf/transaction/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ da_scala_library(
3737
"//canton:scala-utils",
3838
"//daml-lf/data",
3939
"//daml-lf/language",
40+
"@maven//:com_google_guava_guava",
4041
"@maven//:com_google_protobuf_protobuf_java",
4142
],
4243
)

0 commit comments

Comments
 (0)