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

Minor changes to address PR feedback and comments

Browse Source
This commit is contained in:
Jose Coll 2016-11-01 11:39:11 +00:00
parent 96007cd777
commit c5500caf98
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/kotlin/com/r3corda/core/node/services/Services.kt
View File

@ -168,6 +168,9 @@ interface VaultService {
/** /**
* Add a note to an existing [LedgerTransaction] given by its unique [SecureHash] id * Add a note to an existing [LedgerTransaction] given by its unique [SecureHash] id
* Multiple notes may be attached to the same [LedgerTransaction].
* These are additively and immutably persisted within the node local vault database in a single textual field
* using a semi-colon separator
*/ */
fun addNoteToTransaction(txnId: SecureHash, noteText: String) fun addNoteToTransaction(txnId: SecureHash, noteText: String)

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

@ -77,10 +77,6 @@ class NodeVaultService(private val services: ServiceHub) : SingletonSerializeAsT
} }
} }
fun allTransactionNotes(): Map<SecureHash,Set<String>> {
return transactionNotes
}
val _updatesPublisher = PublishSubject.create<Vault.Update>() val _updatesPublisher = PublishSubject.create<Vault.Update>()
fun allUnconsumedStates(): Iterable<StateAndRef<ContractState>> { fun allUnconsumedStates(): Iterable<StateAndRef<ContractState>> {
@ -104,14 +100,14 @@ class NodeVaultService(private val services: ServiceHub) : SingletonSerializeAsT
} }
}) })
override val currentVault: Vault get() = mutex.locked { Vault(allUnconsumedStates(), allTransactionNotes()) } override val currentVault: Vault get() = mutex.locked { Vault(allUnconsumedStates(), transactionNotes) }
override val updates: Observable<Vault.Update> override val updates: Observable<Vault.Update>
get() = mutex.locked { _updatesPublisher } get() = mutex.locked { _updatesPublisher }
override fun track(): Pair<Vault, Observable<Vault.Update>> { override fun track(): Pair<Vault, Observable<Vault.Update>> {
return mutex.locked { return mutex.locked {
Pair(Vault(allUnconsumedStates(), allTransactionNotes()), _updatesPublisher.bufferUntilSubscribed()) Pair(Vault(allUnconsumedStates(), transactionNotes), _updatesPublisher.bufferUntilSubscribed())
} }
} }
@ -135,7 +131,6 @@ class NodeVaultService(private val services: ServiceHub) : SingletonSerializeAsT
return currentVault return currentVault
} }
override fun addNoteToTransaction(txnId: SecureHash, noteText: String) { override fun addNoteToTransaction(txnId: SecureHash, noteText: String) {
mutex.locked { mutex.locked {
val notes = transactionNotes.getOrPut(key = txnId, defaultValue = { val notes = transactionNotes.getOrPut(key = txnId, defaultValue = {
@ -300,5 +295,4 @@ class NodeVaultService(private val services: ServiceHub) : SingletonSerializeAsT
false false
} }
} }
} }

1
node/src/test/kotlin/com/r3corda/node/services/NodeVaultServiceTest.kt
View File

@ -85,7 +85,6 @@ class NodeVaultServiceTest {
@Test @Test
fun addNoteToTransaction() { fun addNoteToTransaction() {
databaseTransaction(database) { databaseTransaction(database) {
val services = object : MockServices() { val services = object : MockServices() {
override val vaultService: VaultService = NodeVaultService(this) override val vaultService: VaultService = NodeVaultService(this)