ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-30 16:14:39 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix bugs in the trade finance contracts and tests, where txns weren't being properly verified and thus the lack of timestamping wasn't detected.

Browse Source
This commit is contained in:
Mike Hearn 2016-07-29 15:43:24 +02:00
parent 1c3379f508
commit 301d787e45
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
experimental/src/main/kotlin/com/r3corda/contracts/BillOfLadingAgreement.kt
View File

@ -3,7 +3,10 @@ package com.r3corda.contracts
import com.r3corda.core.contracts.* import com.r3corda.core.contracts.*
import com.r3corda.core.crypto.Party import com.r3corda.core.crypto.Party
import com.r3corda.core.crypto.SecureHash import com.r3corda.core.crypto.SecureHash
import com.r3corda.core.days
import com.r3corda.core.testing.DUMMY_NOTARY
import java.security.PublicKey import java.security.PublicKey
import java.time.Instant
import java.time.LocalDate import java.time.LocalDate
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -109,9 +112,11 @@ class BillOfLadingAgreement : Contract {
/** /**
* Returns a transaction that issues a Bill of Lading Agreement * Returns a transaction that issues a Bill of Lading Agreement
*/ */
fun generateIssue(owner: PublicKey, beneficiary: Party, props: BillOfLadingProperties, notary: Party? = null): TransactionBuilder { fun generateIssue(owner: PublicKey, beneficiary: Party, props: BillOfLadingProperties, notary: Party = DUMMY_NOTARY): TransactionBuilder {
val state = State(owner, beneficiary, props) val state = State(owner, beneficiary, props)
return TransactionType.General.Builder(notary = notary).withItems(state, Command(Commands.IssueBL(), props.carrierOwner.owningKey)) val builder = TransactionType.General.Builder(notary = notary)
builder.setTime(Instant.now(), notary, 1.days)
return builder.withItems(state, Command(Commands.IssueBL(), props.carrierOwner.owningKey))
} }
/** /**

7
experimental/src/main/kotlin/com/r3corda/contracts/LOC.kt
View File

@ -4,7 +4,10 @@ import com.r3corda.contracts.asset.sumCashBy
import com.r3corda.core.contracts.* import com.r3corda.core.contracts.*
import com.r3corda.core.crypto.Party import com.r3corda.core.crypto.Party
import com.r3corda.core.crypto.SecureHash import com.r3corda.core.crypto.SecureHash
import com.r3corda.core.days
import com.r3corda.core.testing.DUMMY_NOTARY
import java.security.PublicKey import java.security.PublicKey
import java.time.Instant
import java.time.LocalDate import java.time.LocalDate
import java.time.Period import java.time.Period
import java.time.ZoneOffset import java.time.ZoneOffset
@ -142,7 +145,9 @@ class LOC : Contract {
fun generateIssue(beneficiaryPaid: Boolean, issued: Boolean, terminated: Boolean, props: LOCProperties, notary: Party): TransactionBuilder { fun generateIssue(beneficiaryPaid: Boolean, issued: Boolean, terminated: Boolean, props: LOCProperties, notary: Party): TransactionBuilder {
val state = State(beneficiaryPaid, issued, terminated, props) val state = State(beneficiaryPaid, issued, terminated, props)
return TransactionType.General.Builder(notary = notary).withItems(state, Command(Commands.Issuance(), props.issuingbank.owningKey)) val builder = TransactionType.General.Builder(notary = notary)
builder.setTime(Instant.now(), notary, 1.days)
return builder.withItems(state, Command(Commands.Issuance(), props.issuingbank.owningKey))
} }

3
experimental/src/test/kotlin/com/r3corda/contracts/BillOfLadingAgreementTests.kt
View File

@ -48,8 +48,9 @@ class BillOfLadingAgreementTests {
@Test @Test
fun issueGenerationMethod() { fun issueGenerationMethod() {
val ptx = BillOfLadingAgreement().generateIssue(Bill.owner, Bill.beneficiary,Bill.props, notary = DUMMY_NOTARY).apply { val ptx = BillOfLadingAgreement().generateIssue(Bill.owner, Bill.beneficiary,Bill.props).apply {
signWith(ALICE_KEY) signWith(ALICE_KEY)
signWith(DUMMY_NOTARY_KEY)
} }
val stx = ptx.toSignedTransaction() val stx = ptx.toSignedTransaction()
stx.verifyToLedgerTransaction(MOCK_IDENTITY_SERVICE,attachments) stx.verifyToLedgerTransaction(MOCK_IDENTITY_SERVICE,attachments)

1
experimental/src/test/kotlin/com/r3corda/contracts/LOCTests.kt
View File

@ -120,6 +120,7 @@ class LOCTests {
fun issueSignedByBank() { fun issueSignedByBank() {
val ptx = LOC().generateIssue(LOCstate.beneficiaryPaid, LOCstate.issued, LOCstate.terminated, LOCstate.props, DUMMY_NOTARY).apply { val ptx = LOC().generateIssue(LOCstate.beneficiaryPaid, LOCstate.issued, LOCstate.terminated, LOCstate.props, DUMMY_NOTARY).apply {
signWith(MEGA_CORP_KEY) signWith(MEGA_CORP_KEY)
signWith(DUMMY_NOTARY_KEY)
} }
val stx = ptx.toSignedTransaction() val stx = ptx.toSignedTransaction()
stx.verify() stx.verify()