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

Merge remote-tracking branch 'origin/colljos-vault-transaction-notes' into colljos-vault-transaction-notes

Browse Source 
# Conflicts:
#	core/src/main/kotlin/com/r3corda/core/node/services/Services.kt
#	core/src/main/kotlin/com/r3corda/core/testing/InMemoryVaultService.kt
#	node/src/main/kotlin/com/r3corda/node/services/vault/NodeVaultService.kt
This commit is contained in:
Jose Coll
2016-10-28 09:59:58 +01:00
parent 369214a747 504ec42720
commit b46de0b964
3 changed files with 144 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
node/src/main/kotlin/com/r3corda/node/services/vault/NodeVaultService.kt
View File

@ -7,6 +7,7 @@ import com.r3corda.core.bufferUntilSubscribed
import com.r3corda.core.contracts.*
import com.r3corda.core.crypto.SecureHash
import com.r3corda.core.crypto.Party
import com.r3corda.core.crypto.SecureHash
import com.r3corda.core.node.ServiceHub
import com.r3corda.core.node.services.Vault
import com.r3corda.core.node.services.VaultService