DAML-LF: factorize ScenarioNodeId and EventId (#6256)

CHANGELOG_BEGIN CHANGELOG_END
digital-asset · Jun 8, 2020 · d064ea4 · d064ea4
1 parent 2a4e9dc
commit d064ea4
Show file tree

Hide file tree

Showing 23 changed files with 204 additions and 232 deletions.
diff --git a/...cenario-service/server/src/main/scala/com/digitalasset/daml/lf/scenario/Conversions.scala b/...cenario-service/server/src/main/scala/com/digitalasset/daml/lf/scenario/Conversions.scala
@@ -29,10 +29,10 @@ final class Conversions(
   private val ptxCoidToNodeId = machine.ptx.nodes
     .collect {
       case (nodeId, node: N.NodeCreate[V.ContractId, _]) =>
-        node.coid -> ledger.ptxNodeId(nodeId)
+        node.coid -> ledger.ptxEventId(nodeId)
     }
 
-  private val coidToNodeId = ledger.ledgerData.coidToNodeId ++ ptxCoidToNodeId
+  private val coidToEventId = ledger.ledgerData.coidToNodeId ++ ptxCoidToNodeId
 
   private val nodes =
     ledger.ledgerData.nodeInfos.map(Function.tupled(convertNode))
@@ -307,7 +307,7 @@ final class Conversions(
   def mkContractRef(coid: V.ContractId, templateId: Ref.Identifier): ContractRef =
     ContractRef.newBuilder
       .setRelative(false)
-      .setContractId(coidToNodeId(coid))
+      .setContractId(coidToEventId(coid).toLedgerString)
       .setTemplateId(convertIdentifier(templateId))
       .build
 
@@ -352,7 +352,7 @@ final class Conversions(
       rtx: Ledger.RichTransaction,
   ): Transaction = {
     val convertedGlobalImplicitDisclosure = rtx.globalImplicitDisclosure.map {
-      case (coid, parties) => coidToNodeId(coid) -> parties
+      case (coid, parties) => coidToEventId(coid) -> parties
     }
     Transaction.newBuilder
       .setCommitter(convertParty(rtx.committer))
@@ -392,13 +392,13 @@ final class Conversions(
     builder.build
   }
 
-  def convertNodeId(nodeId: Ledger.ScenarioNodeId): NodeId =
-    NodeId.newBuilder.setId(nodeId).build
+  def convertNodeId(nodeId: Ledger.EventId): NodeId =
+    NodeId.newBuilder.setId(nodeId.toLedgerString).build
 
   def convertTxNodeId(nodeId: Tx.NodeId): NodeId =
     NodeId.newBuilder.setId(nodeId.index.toString).build
 
-  def convertNode(nodeId: Ledger.ScenarioNodeId, nodeInfo: Ledger.LedgerNodeInfo): Node = {
+  def convertNode(nodeId: Ledger.EventId, nodeInfo: Ledger.LedgerNodeInfo): Node = {
     val builder = Node.newBuilder
     builder
       .setNodeId(convertNodeId(nodeId))
@@ -435,22 +435,22 @@ final class Conversions(
       case fetch: N.NodeFetch.WithTxValue[V.ContractId] =>
         builder.setFetch(
           Node.Fetch.newBuilder
-            .setContractId(coidToNodeId(fetch.coid))
+            .setContractId(coidToEventId(fetch.coid).toLedgerString)
             .setTemplateId(convertIdentifier(fetch.templateId))
             .addAllSignatories(fetch.signatories.map(convertParty).asJava)
             .addAllStakeholders(fetch.stakeholders.map(convertParty).asJava)
             .build,
         )
       case ex: N.NodeExercises[
-            Ledger.ScenarioNodeId,
+            Ledger.EventId,
             V.ContractId,
             Tx.Value[
               V.ContractId,
             ]] =>
         ex.optLocation.map(loc => builder.setLocation(convertLocation(loc)))
         builder.setExercise(
           Node.Exercise.newBuilder
-            .setTargetContractId(coidToNodeId(ex.targetCoid))
+            .setTargetContractId(coidToEventId(ex.targetCoid).toLedgerString)
             .setTemplateId(convertIdentifier(ex.templateId))
             .setChoiceId(ex.choiceId)
             .setConsuming(ex.consuming)
@@ -460,7 +460,7 @@ final class Conversions(
             .addAllStakeholders(ex.stakeholders.map(convertParty).asJava)
             .addAllChildren(
               ex.children
-                .map(nid => NodeId.newBuilder.setId(nid).build)
+                .map(nid => NodeId.newBuilder.setId(nid.toLedgerString).build)
                 .toSeq
                 .asJava,
             )
@@ -472,7 +472,7 @@ final class Conversions(
         val lbkBuilder = Node.LookupByKey.newBuilder
           .setTemplateId(convertIdentifier(lbk.templateId))
           .setKeyWithMaintainers(convertKeyWithMaintainers(convertVersionedValue, lbk.key))
-        lbk.result.foreach(cid => lbkBuilder.setContractId(coidToNodeId(cid)))
+        lbk.result.foreach(cid => lbkBuilder.setContractId(coidToEventId(cid).toLedgerString))
         builder.setLookupByKey(lbkBuilder)
 
     }
@@ -518,7 +518,7 @@ final class Conversions(
       case fetch: N.NodeFetch[V.ContractId, Val] =>
         builder.setFetch(
           Node.Fetch.newBuilder
-            .setContractId(coidToNodeId(fetch.coid))
+            .setContractId(coidToEventId(fetch.coid).toLedgerString)
             .setTemplateId(convertIdentifier(fetch.templateId))
             .addAllSignatories(fetch.signatories.map(convertParty).asJava)
             .addAllStakeholders(fetch.stakeholders.map(convertParty).asJava)
@@ -528,7 +528,7 @@ final class Conversions(
         ex.optLocation.map(loc => builder.setLocation(convertLocation(loc)))
         builder.setExercise(
           Node.Exercise.newBuilder
-            .setTargetContractId(coidToNodeId(ex.targetCoid))
+            .setTargetContractId(coidToEventId(ex.targetCoid).toLedgerString)
             .setTemplateId(convertIdentifier(ex.templateId))
             .setChoiceId(ex.choiceId)
             .setConsuming(ex.consuming)
@@ -550,7 +550,7 @@ final class Conversions(
         builder.setLookupByKey({
           val builder = Node.LookupByKey.newBuilder
             .setKeyWithMaintainers(convertKeyWithMaintainers(convertValue, lookup.key))
-          lookup.result.foreach(cid => builder.setContractId(coidToNodeId(cid)))
+          lookup.result.foreach(cid => builder.setContractId(coidToEventId(cid).toLedgerString))
           builder.build
         })
     }
@@ -635,7 +635,7 @@ final class Conversions(
         tycon.foreach(x => eBuilder.setEnumId(convertIdentifier(x)))
         builder.setEnum(eBuilder.build)
       case V.ValueContractId(coid) =>
-        builder.setContractId(coidToNodeId(coid))
+        builder.setContractId(coidToEventId(coid).toLedgerString)
       case V.ValueList(values) =>
         builder.setList(
           v1.List.newBuilder

diff --git a/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/Pretty.scala b/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/Pretty.scala
@@ -248,16 +248,16 @@ object Pretty {
         text("mustFailAt") & prettyParty(amf.actor) & prettyLoc(amf.optLocation)
     }
 
+  def prettyKeyWithMaintainers(key: KeyWithMaintainers[Value[ContractId]]): Doc =
+    // the maintainers are induced from the key -- so don't clutter
+    prettyValue(false)(key.key)
+
   def prettyVersionedKeyWithMaintainers(
       key: KeyWithMaintainers[Transaction.Value[ContractId]]): Doc =
     // the maintainers are induced from the key -- so don't clutter
     prettyVersionedValue(false)(key.key)
 
-  def prettyKeyWithMaintainers(key: KeyWithMaintainers[Value[ContractId]]): Doc =
-    // the maintainers are induced from the key -- so don't clutter
-    prettyValue(false)(key.key)
-
-  def prettyNodeInfo(l: L.Ledger)(nodeId: L.ScenarioNodeId): Doc = {
+  def prettyNodeInfo(l: L.Ledger)(nodeId: L.EventId): Doc = {
     def arrowRight(d: Doc) = text("└─>") & d
     def meta(d: Doc) = text("│  ") & d
 
@@ -272,11 +272,10 @@ object Pretty {
       case ea: NodeFetch[ContractId, Transaction.Value[ContractId]] =>
         "ensure active" &: prettyContractId(ea.coid)
       case ex: NodeExercises[
-            L.ScenarioNodeId,
+            L.EventId,
             ContractId,
-            Transaction.Value[
-              ContractId
-            ]] =>
+            Transaction.Value[ContractId]
+          ] =>
         val children =
           if (ex.children.nonEmpty)
             text("children:") / stack(ex.children.toList.map(prettyNodeInfo(l)))
@@ -334,8 +333,8 @@ object Pretty {
     )
   }
 
-  def prettyLedgerNodeId(n: L.ScenarioNodeId): Doc =
-    text(n)
+  def prettyLedgerNodeId(n: L.EventId): Doc =
+    text(n.toLedgerString)
 
   def prettyContractInst(coinst: ContractInst[Value[ContractId]]): Doc =
     (prettyIdentifier(coinst.template) / text("with:") &

diff --git a/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/SError.scala b/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/SError.scala
@@ -76,7 +76,7 @@ object SError {
   final case class ScenarioErrorContractNotActive(
       coid: ContractId,
       templateId: Identifier,
-      consumedBy: Ledger.ScenarioNodeId,
+      consumedBy: Ledger.EventId,
   ) extends SErrorScenario
 
   /** We tried to fetch / exercise a contract of the wrong type --