Engine: Change type of ExerciseCommand contractId (#5182)

CHANGELOG_BEGIN
CHANGELOG_END
This commit is contained in:
Remy 2020-03-26 10:44:24 +01:00 committed by GitHub
parent 9e5dff4109
commit 9880f3d7c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 21 deletions

View File

@ -171,7 +171,7 @@ private[engine] class CommandPreprocessor(compiledPackages: MutableCompiledPacka
case CreateCommand(templateId, argument) =>
preprocessCreate(templateId, argument)
case ExerciseCommand(templateId, contractId, choiceId, argument) =>
preprocessExercise(templateId, Value.AbsoluteContractId(contractId), choiceId, argument)
preprocessExercise(templateId, contractId, choiceId, argument)
case ExerciseByKeyCommand(templateId, contractKey, choiceId, argument) =>
preprocessExerciseByKey(
templateId,

View File

@ -120,7 +120,7 @@ class EngineTest extends WordSpec with Matchers with EitherValues with BazelRunf
BasicTests_WithKey,
ValueRecord(_, ImmArray((_, ValueParty(`alice`)), (_, ValueInt64(42)))),
) =>
Some(AbsoluteContractId("1"))
Some(toContractId("1"))
case _ =>
None
}
@ -948,7 +948,7 @@ class EngineTest extends WordSpec with Matchers with EitherValues with BazelRunf
children,
_,
_) =>
coid shouldBe AbsoluteContractId(originalCoid)
coid shouldBe toContractId(originalCoid)
consuming shouldBe true
actingParties shouldBe Set(bob)
children.map(_.index) shouldBe ImmArray(1)
@ -1000,10 +1000,10 @@ class EngineTest extends WordSpec with Matchers with EitherValues with BazelRunf
partyEvents.roots.length shouldBe 1
val bobExercise = partyEvents.events(partyEvents.roots(0))
val cid =
AbsoluteContractId("00b39433a649bebecd3b01d651be38a75923efdb92f34592b5600aee3fec8a8cc3")
toContractId("00b39433a649bebecd3b01d651be38a75923efdb92f34592b5600aee3fec8a8cc3")
bobExercise shouldBe
ExerciseEvent(
contractId = AbsoluteContractId(originalCoid),
contractId = toContractId(originalCoid),
templateId = Identifier(basicTestsPkgId, "BasicTests:CallablePayout"),
choice = "Transfer",
choiceArgument = assertAsVersionedValue(
@ -1046,7 +1046,7 @@ class EngineTest extends WordSpec with Matchers with EitherValues with BazelRunf
val submissionSeed = hash("dynamic fetch actors")
val fetchedStrCid = "1"
val fetchedCid = AbsoluteContractId(fetchedStrCid)
val fetchedCid = toContractId(fetchedStrCid)
val fetchedStrTid = "BasicTests:Fetched"
val fetchedTArgs = ImmArray(
(Some[Name]("sig1"), ValueParty(alice)),
@ -1058,7 +1058,7 @@ class EngineTest extends WordSpec with Matchers with EitherValues with BazelRunf
val fetcherTid = Identifier(basicTestsPkgId, fetcherStrTid)
val fetcher1StrCid = "2"
val fetcher1Cid = AbsoluteContractId(fetcher1StrCid)
val fetcher1Cid = toContractId(fetcher1StrCid)
val fetcher1TArgs = ImmArray(
(Some[Name]("sig"), ValueParty(alice)),
(Some[Name]("obs"), ValueParty(bob)),
@ -1066,7 +1066,7 @@ class EngineTest extends WordSpec with Matchers with EitherValues with BazelRunf
)
val fetcher2StrCid = "3"
val fetcher2Cid = AbsoluteContractId(fetcher2StrCid)
val fetcher2Cid = toContractId(fetcher2StrCid)
val fetcher2TArgs = ImmArray(
(Some[Name]("sig"), ValueParty(party)),
(Some[Name]("obs"), ValueParty(alice)),
@ -1169,7 +1169,7 @@ class EngineTest extends WordSpec with Matchers with EitherValues with BazelRunf
val submissionSeed = hash("reinterpreting fetch nodes")
val fetchedCid = AbsoluteContractId("1")
val fetchedCid = toContractId("1")
val fetchedStrTid = "BasicTests:Fetched"
val fetchedTid = Identifier(basicTestsPkgId, fetchedStrTid)
@ -1253,8 +1253,8 @@ object EngineTest {
private implicit def toName(s: String): Name =
Name.assertFromString(s)
private implicit def toContractId(s: String): ContractIdString =
ContractIdString.assertFromString(s)
private implicit def toContractId(s: String): AbsoluteContractId =
AbsoluteContractId(ContractIdString.assertFromString(s))
private def ArrayList[X](as: X*): util.ArrayList[X] = {
val a = new util.ArrayList[X](as.length)

View File

@ -239,18 +239,20 @@ class LargeTransactionTest extends WordSpec with Matchers with BazelRunfiles {
private def toListContainerExerciseCmd(
templateId: Identifier,
contractId: AbsoluteContractId): ExerciseCommand = {
contractId: AbsoluteContractId
): ExerciseCommand = {
val choice = "ToListContainer"
val emptyArgs = ValueRecord(None, ImmArray(Seq()))
ExerciseCommand(templateId, contractId.coid, choice, (emptyArgs))
val emptyArgs = ValueRecord(None, ImmArray.empty)
ExerciseCommand(templateId, contractId, choice, (emptyArgs))
}
private def toListOfIntContainers(
templateId: Identifier,
contractId: AbsoluteContractId): ExerciseCommand = {
contractId: AbsoluteContractId
): ExerciseCommand = {
val choice = "ToListOfIntContainers"
val emptyArgs = ValueRecord(None, ImmArray(Seq()))
ExerciseCommand(templateId, contractId.coid, choice, (emptyArgs))
val emptyArgs = ValueRecord(None, ImmArray.empty)
ExerciseCommand(templateId, contractId, choice, (emptyArgs))
}
private def listUtilCreateCmd(templateId: Identifier): CreateCommand = {
@ -264,7 +266,7 @@ class LargeTransactionTest extends WordSpec with Matchers with BazelRunfiles {
val choiceDefRef = Identifier(templateId.packageId, qn(s"LargeTransaction:$choice"))
val damlList = ValueList(FrontStack(elements = List.range(0L, size.toLong).map(ValueInt64)))
val choiceArgs = ValueRecord(Some(choiceDefRef), ImmArray((None, damlList)))
ExerciseCommand(templateId, contractId.coid, choice, (choiceArgs))
ExerciseCommand(templateId, contractId, choice, choiceArgs)
}
private def assertSizeExerciseTransaction(

View File

@ -32,7 +32,7 @@ final case class CreateCommand(templateId: Identifier, argument: Value[Value.Abs
*/
final case class ExerciseCommand(
templateId: Identifier,
contractId: ContractIdString,
contractId: Value.AbsoluteContractId,
choiceId: ChoiceName,
argument: Value[Value.AbsoluteContractId],
) extends Command

View File

@ -133,7 +133,7 @@ final class CommandsValidator(ledgerId: LedgerId) {
} yield
ExerciseCommand(
templateId = validatedTemplateId,
contractId = contractId,
contractId = Lf.AbsoluteContractId(contractId),
choiceId = choice,
argument = validatedValue)

View File

@ -76,7 +76,7 @@ class KVUtilsTransactionSpec extends WordSpec with Matchers {
def exerciseCmd(coid: String, templateId: Ref.Identifier): Command =
ExerciseCommand(
templateId,
Ref.ContractIdString.assertFromString(coid),
Value.AbsoluteContractId(Ref.ContractIdString.assertFromString(coid)),
simpleConsumeChoiceid,
ValueUnit)