From 210ea2ed95faae6f46ecbbc969f4b4ee544a6fbc Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Tue, 6 Sep 2016 12:32:21 +0200 Subject: [PATCH] Minor: remove the TODO about the notary signing last. It is not important at this level as the notary signature does not cover the other signatures. Also a small formatting change to the withAdditionalSignatures methods. --- .../core/transactions/SignedTransaction.kt | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/core/src/main/kotlin/com/r3corda/core/transactions/SignedTransaction.kt b/core/src/main/kotlin/com/r3corda/core/transactions/SignedTransaction.kt index 982fa87a9d..381c02ec7e 100644 --- a/core/src/main/kotlin/com/r3corda/core/transactions/SignedTransaction.kt +++ b/core/src/main/kotlin/com/r3corda/core/transactions/SignedTransaction.kt @@ -75,19 +75,14 @@ data class SignedTransaction(val txBits: SerializedBytes, return missingElements } - /** Returns the same transaction but with an additional (unchecked) signature */ - fun withAdditionalSignature(sig: DigitalSignature.WithKey): SignedTransaction { - // TODO: need to make sure the Notary signs last - return copy(sigs = sigs + sig) - } - - fun withAdditionalSignatures(sigList: Iterable): SignedTransaction { - return copy(sigs = sigs + sigList) - } + /** Returns the same transaction but with an additional (unchecked) signature. */ + fun withAdditionalSignature(sig: DigitalSignature.WithKey) = copy(sigs = sigs + sig) + /** Returns the same transaction but with an additional (unchecked) signatures. */ + fun withAdditionalSignatures(sigList: Iterable) = copy(sigs = sigs + sigList) /** Alias for [withAdditionalSignature] to let you use Kotlin operator overloading. */ operator fun plus(sig: DigitalSignature.WithKey) = withAdditionalSignature(sig) - + /** Alias for [withAdditionalSignatures] to let you use Kotlin operator overloading. */ operator fun plus(sigList: Collection) = withAdditionalSignatures(sigList) /**