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

node: Relax TwoPartyTradeProtocolTests so it only checks a subsequence of store accesses

Browse Source
This commit is contained in:
Andras Slemmer
2016-09-08 15:15:50 +01:00
parent ca93f33356
commit 0fc560d20a
1 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
node/src/test/kotlin/com/r3corda/node/messaging/TwoPartyTradeProtocolTests.kt
View File

@ -298,17 +298,19 @@ class TwoPartyTradeProtocolTests {
run { run {
val records = (bobNode.storage.validatedTransactions as RecordingTransactionStorage).records val records = (bobNode.storage.validatedTransactions as RecordingTransactionStorage).records
// Check Bobs's database accesses as Bob's cash transactions are downloaded by Alice. // Check Bobs's database accesses as Bob's cash transactions are downloaded by Alice.
assertThat(records).containsExactly( records.expectEvents(isStrict = false) {
sequence(
// Buyer Bob is told about Alice's commercial paper, but doesn't know it .. // Buyer Bob is told about Alice's commercial paper, but doesn't know it ..
TxRecord.Get(alicesFakePaper[0].id), expect(TxRecord.Get(alicesFakePaper[0].id)),
// He asks and gets the tx, validates it, sees it's a self issue with no dependencies, stores. // He asks and gets the tx, validates it, sees it's a self issue with no dependencies, stores.
TxRecord.Add(alicesSignedTxns.values.first()), expect(TxRecord.Add(alicesSignedTxns.values.first())),
// Alice gets Bob's proposed transaction and doesn't know his two cash states. She asks, Bob answers. // Alice gets Bob's proposed transaction and doesn't know his two cash states. She asks, Bob answers.
TxRecord.Get(bobsFakeCash[1].id), expect(TxRecord.Get(bobsFakeCash[1].id)),
TxRecord.Get(bobsFakeCash[2].id), expect(TxRecord.Get(bobsFakeCash[2].id)),
// Alice notices that Bob's cash txns depend on a third tx she also doesn't know. She asks, Bob answers. // Alice notices that Bob's cash txns depend on a third tx she also doesn't know. She asks, Bob answers.
TxRecord.Get(bobsFakeCash[0].id) expect(TxRecord.Get(bobsFakeCash[0].id))
) )
}
// Bob has downloaded the attachment. // Bob has downloaded the attachment.
bobNode.storage.attachments.openAttachment(attachmentID)!!.openAsJAR().use { bobNode.storage.attachments.openAttachment(attachmentID)!!.openAsJAR().use {
@ -321,36 +323,38 @@ class TwoPartyTradeProtocolTests {
// And from Alice's perspective ... // And from Alice's perspective ...
run { run {
val records = (aliceNode.storage.validatedTransactions as RecordingTransactionStorage).records val records = (aliceNode.storage.validatedTransactions as RecordingTransactionStorage).records
assertThat(records).containsExactly( records.expectEvents(isStrict = false) {
sequence(
// Seller Alice sends her seller info to Bob, who wants to check the asset for sale. // Seller Alice sends her seller info to Bob, who wants to check the asset for sale.
// He requests, Alice looks up in her DB to send the tx to Bob // He requests, Alice looks up in her DB to send the tx to Bob
TxRecord.Get(alicesFakePaper[0].id), expect(TxRecord.Get(alicesFakePaper[0].id)),
// Seller Alice gets a proposed tx which depends on Bob's two cash txns and her own tx. // Seller Alice gets a proposed tx which depends on Bob's two cash txns and her own tx.
TxRecord.Get(bobsFakeCash[1].id), expect(TxRecord.Get(bobsFakeCash[1].id)),
TxRecord.Get(bobsFakeCash[2].id), expect(TxRecord.Get(bobsFakeCash[2].id)),
TxRecord.Get(alicesFakePaper[0].id), expect(TxRecord.Get(alicesFakePaper[0].id)),
// Alice notices that Bob's cash txns depend on a third tx she also doesn't know. // Alice notices that Bob's cash txns depend on a third tx she also doesn't know.
TxRecord.Get(bobsFakeCash[0].id), expect(TxRecord.Get(bobsFakeCash[0].id)),
// Bob answers with the transactions that are now all verifiable, as Alice bottomed out. // Bob answers with the transactions that are now all verifiable, as Alice bottomed out.
// Bob's transactions are valid, so she commits to the database // Bob's transactions are valid, so she commits to the database
TxRecord.Add(bobsSignedTxns[bobsFakeCash[0].id]!!), expect(TxRecord.Add(bobsSignedTxns[bobsFakeCash[0].id]!!)),
TxRecord.Get(bobsFakeCash[0].id), // Verify expect(TxRecord.Get(bobsFakeCash[0].id)), // Verify
TxRecord.Add(bobsSignedTxns[bobsFakeCash[2].id]!!), expect(TxRecord.Add(bobsSignedTxns[bobsFakeCash[2].id]!!)),
TxRecord.Get(bobsFakeCash[0].id), // Verify expect(TxRecord.Get(bobsFakeCash[0].id)), // Verify
TxRecord.Add(bobsSignedTxns[bobsFakeCash[1].id]!!), expect(TxRecord.Add(bobsSignedTxns[bobsFakeCash[1].id]!!)),
// Now she verifies the transaction is contract-valid (not signature valid) which means // Now she verifies the transaction is contract-valid (not signature valid) which means
// looking up the states again. // looking up the states again.
TxRecord.Get(bobsFakeCash[1].id), expect(TxRecord.Get(bobsFakeCash[1].id)),
TxRecord.Get(bobsFakeCash[2].id), expect(TxRecord.Get(bobsFakeCash[2].id)),
TxRecord.Get(alicesFakePaper[0].id), expect(TxRecord.Get(alicesFakePaper[0].id)),
// Alice needs to look up the input states to find out which Notary they point to // Alice needs to look up the input states to find out which Notary they point to
TxRecord.Get(bobsFakeCash[1].id), expect(TxRecord.Get(bobsFakeCash[1].id)),
TxRecord.Get(bobsFakeCash[2].id), expect(TxRecord.Get(bobsFakeCash[2].id)),
TxRecord.Get(alicesFakePaper[0].id) expect(TxRecord.Get(alicesFakePaper[0].id))
) )
} }
} }
} }
}
@Test @Test
fun `dependency with error on buyer side`() { fun `dependency with error on buyer side`() {