From 723e610dfc0f41d32d76bb22a84d9c23d7ce7979 Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Fri, 27 May 2016 16:49:07 +0100 Subject: [PATCH] Rename verifyMoveCommand() Rename verifyMoveCommands() to verifyMoveCommand() to represent that move commands must be singular within a transaction. --- .../src/main/kotlin/com/r3corda/contracts/cash/FungibleAsset.kt | 2 +- core/src/main/kotlin/com/r3corda/core/contracts/ContractsDSL.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/cash/FungibleAsset.kt b/contracts/src/main/kotlin/com/r3corda/contracts/cash/FungibleAsset.kt index 957fbb2ec2..145ef9b0b8 100644 --- a/contracts/src/main/kotlin/com/r3corda/contracts/cash/FungibleAsset.kt +++ b/contracts/src/main/kotlin/com/r3corda/contracts/cash/FungibleAsset.kt @@ -89,7 +89,7 @@ abstract class FungibleAsset : Contract { (inputAmount == outputAmount + amountExitingLedger) } - verifyMoveCommands(inputs, tx) + verifyMoveCommand(inputs, tx) } } } diff --git a/core/src/main/kotlin/com/r3corda/core/contracts/ContractsDSL.kt b/core/src/main/kotlin/com/r3corda/core/contracts/ContractsDSL.kt index d7018b9c3e..834fa36dda 100644 --- a/core/src/main/kotlin/com/r3corda/core/contracts/ContractsDSL.kt +++ b/core/src/main/kotlin/com/r3corda/core/contracts/ContractsDSL.kt @@ -92,7 +92,7 @@ fun List>.getTimestampByName(vararg names: Stri */ @Throws(IllegalArgumentException::class) // TODO: Can we have a common Move command for all contracts and avoid the reified type parameter here? -inline fun verifyMoveCommands(inputs: List, tx: TransactionForContract) { +inline fun verifyMoveCommand(inputs: List, tx: TransactionForContract) { // Now check the digital signatures on the move command. Every input has an owning public key, and we must // see a signature from each of those keys. The actual signatures have been verified against the transaction // data by the platform before execution.