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

Merge branch 'release/os/4.4' into dan/os-4.4-to-4.5-merge-2020-03-26

Browse Source
This commit is contained in:
LankyDan
2020-03-26 14:26:41 +00:00
parent f1c14edd00 a5d49ea111
commit d9c1907c88
8 changed files with 271 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/MockTransactionStorage.kt
View File

@ -21,6 +21,10 @@ open class MockTransactionStorage : WritableTransactionStorage, SingletonSeriali
return getTransaction(id)?.let { doneFuture(it) } ?: _updatesPublisher.filter { it.id == id }.toFuture()
}
override fun trackTransactionWithNoWarning(id: SecureHash): CordaFuture<SignedTransaction> {
return trackTransaction(id)
}
override fun track(): DataFeed<List<SignedTransaction>, SignedTransaction> {
return DataFeed(txns.values.mapNotNull { if (it.isVerified) it.stx else null }, _updatesPublisher)
}