Engine: Small refactoring of partial transactions (#3951)

* small refactoring of partial transaction CHANGELOG_BEGIN CHANGELOG_END * cosmetic changes
digital-asset · Jan 9, 2020 · c0f387f · c0f387f
1 parent 27fd561
commit c0f387f
Show file tree

Hide file tree

Showing 3 changed files with 183 additions and 220 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
@@ -369,12 +369,12 @@ case class Conversions(homePackageId: Ref.PackageId) {
   def convertPartialTransaction(ptx: Tx.PartialTransaction): PartialTransaction = {
     val builder = PartialTransaction.newBuilder
       .addAllNodes(ptx.nodes.map(Function.tupled(convertTxNode)).asJava)
-      .addAllRoots(ptx.roots.toImmArray.toSeq.sortBy(_.index).map(convertTxNodeId).asJava)
+      .addAllRoots(
+        ptx.context.children.toImmArray.toSeq.sortBy(_.index).map(convertTxNodeId).asJava)
 
     ptx.context match {
-      case Tx.ContextRoot =>
-        Unit
-      case Tx.ContextExercises(ctx) =>
+      case Tx.ContextRoot(_) =>
+      case Tx.ContextExercises(ctx, _) =>
         val ecBuilder = ExerciseContext.newBuilder
           .setTargetId(mkContractRef(ctx.targetId, ctx.templateId))
           .setChoiceId(ctx.choiceId)

diff --git a/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/SBuiltin.scala b/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/SBuiltin.scala
@@ -829,7 +829,7 @@ object SBuiltin {
         case _ => crash("Bad key")
       }
       val (coid, newPtx) = machine.ptx
-        .create(
+        .insertCreate(
           coinst = V.ContractInst(template = templateId, arg = createArg, agreementText = agreement),
           optLocation = machine.lastLocation,
           signatories = sigs,
@@ -1006,8 +1006,8 @@ object SBuiltin {
       val observers = extractParties(args.get(2))
       val stakeholders = observers union signatories
       val contextActors = machine.ptx.context match {
-        case ContextExercises(ctx) => ctx.actingParties union ctx.signatories
-        case ContextRoot => machine.committers
+        case ContextExercises(ctx, _) => ctx.actingParties union ctx.signatories
+        case ContextRoot(_) => machine.committers
       }
 
       machine.ptx = machine.ptx.insertFetch(