ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-21 17:56:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-2570 revert multiple contract attachments per transaction

Browse Source
This commit is contained in:
Tudor Malene 2019-02-12 18:49:05 +00:00 committed by tudor.malene@gmail.com
parent a6510ae952
commit 9448b9bd86
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/kotlin/net/corda/core/internal/TransactionVerifierServiceInternal.kt
View File

@ -100,6 +100,8 @@ class Verifier(val ltx: LedgerTransaction,
if (contractWithMultipleAttachments != null) throw TransactionVerificationException.ConflictingAttachmentsRejection(ltx.id, contractWithMultipleAttachments) if (contractWithMultipleAttachments != null) throw TransactionVerificationException.ConflictingAttachmentsRejection(ltx.id, contractWithMultipleAttachments)
val result = contractAttachmentsPerContract.toMap() val result = contractAttachmentsPerContract.toMap()
// Check that there is an attachment for each contract.
if (result.keys != contractClasses) throw TransactionVerificationException.MissingAttachmentRejection(ltx.id, contractClasses.minus(result.keys).first()) if (result.keys != contractClasses) throw TransactionVerificationException.MissingAttachmentRejection(ltx.id, contractClasses.minus(result.keys).first())
return result return result
@ -370,6 +372,7 @@ class Verifier(val ltx: LedgerTransaction,
try { try {
contract.verify(ltx) contract.verify(ltx)
} catch (e: Exception) { } catch (e: Exception) {
logger.error("Error validating transaction ${ltx.id}.", e)
throw TransactionVerificationException.ContractRejection(ltx.id, contract, e) throw TransactionVerificationException.ContractRejection(ltx.id, contract, e)
} }
} }