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

Minor fix following rebase to incoporate Ross changes to CashState definition.

Browse Source
This commit is contained in:
Jose Coll 2016-11-01 16:29:21 +00:00
parent be3b7b14bd
commit e449ba93c4
2 changed files with 2 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
contracts/src/test/kotlin/com/r3corda/contracts/asset/CashTests.kt
View File

@ -85,57 +85,6 @@ class CashTests {
} }
} }
@After
fun tearDown() {
LogHelper.reset(NodeVaultService::class)
dataSource.close()
}
lateinit var services: MockServices
val vault: VaultService get() = services.vaultService
lateinit var dataSource: Closeable
lateinit var database: Database
lateinit var vaultService: Vault
@Before
fun setUp() {
LogHelper.setLevel(NodeVaultService::class)
val dataSourceAndDatabase = configureDatabase(makeTestDataSourceProperties())
dataSource = dataSourceAndDatabase.first
database = dataSourceAndDatabase.second
databaseTransaction(database) {
services = object : MockServices() {
override val keyManagementService: MockKeyManagementService = MockKeyManagementService(MINI_CORP_KEY, MEGA_CORP_KEY, OUR_KEY)
override val vaultService: VaultService = NodeVaultService(this)
override fun recordTransactions(txs: Iterable<SignedTransaction>) {
for (stx in txs) {
storageService.validatedTransactions.addTransaction(stx)
}
// Refactored to use notifyAll() as we have no other unit test for that method with multiple transactions.
vaultService.notifyAll(txs.map { it.tx })
}
}
services.fillWithSomeTestCash(howMuch = 100.DOLLARS, atLeastThisManyStates = 1, atMostThisManyStates = 1,
issuedBy = MEGA_CORP.ref(1), issuerKey = MEGA_CORP_KEY, ownedBy = OUR_PUBKEY_1)
services.fillWithSomeTestCash(howMuch = 400.DOLLARS, atLeastThisManyStates = 1, atMostThisManyStates = 1,
issuedBy = MEGA_CORP.ref(1), issuerKey = MEGA_CORP_KEY, ownedBy = OUR_PUBKEY_1)
services.fillWithSomeTestCash(howMuch = 80.DOLLARS, atLeastThisManyStates = 1, atMostThisManyStates = 1,
issuedBy = MINI_CORP.ref(1), issuerKey = MINI_CORP_KEY, ownedBy = OUR_PUBKEY_1)
services.fillWithSomeTestCash(howMuch = 80.SWISS_FRANCS, atLeastThisManyStates = 1, atMostThisManyStates = 1,
issuedBy = MINI_CORP.ref(1), issuerKey = MINI_CORP_KEY, ownedBy = OUR_PUBKEY_1)
vaultService = services.vaultService.currentVault
}
}
@After
fun tearDown() {
LogHelper.reset(NodeVaultService::class)
dataSource.close()
}
@Test @Test
fun trivial() { fun trivial() {
transaction { transaction {
@ -614,7 +563,7 @@ class CashTests {
databaseTransaction(database) { databaseTransaction(database) {
val tx = TransactionType.General.Builder(DUMMY_NOTARY) val tx = TransactionType.General.Builder(DUMMY_NOTARY)
vault.generateSpend(tx, 80.DOLLARS, ALICE_PUBKEY, setOf(MINI_CORP)) vault.generateSpend(tx, 80.DOLLARS, ALICE_PUBKEY, setOf(MINI_CORP.ref(1)))
assertEquals(vaultService.states.elementAt(2).ref, tx.inputStates()[0]) assertEquals(vaultService.states.elementAt(2).ref, tx.inputStates()[0])
} }

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

@ -147,7 +147,7 @@ class NodeVaultService(private val services: ServiceHub) : SingletonSerializeAsT
var acceptableCoins = run { var acceptableCoins = run {
val ofCurrency = assetsStates.filter { it.state.data.amount.token.product == currency } val ofCurrency = assetsStates.filter { it.state.data.amount.token.product == currency }
if (onlyFromIssuers != null) if (onlyFromIssuers != null)
ofCurrency.filter { it.state.data.amount.token.issuer.party in onlyFromIssuers } ofCurrency.filter { it.state.data.amount.token.issuer in onlyFromIssuers }
else else
ofCurrency ofCurrency
} }