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

client, node: Fix compile error after rebase

Browse Source
This commit is contained in:
Andras Slemmer
2016-09-08 12:07:58 +01:00
parent 3042407250
commit c04a3401c3
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/src/integration-test/kotlin/com/r3corda/client/WalletMonitorClientTests.kt
View File

@ -105,9 +105,9 @@ class WalletMonitorClientTests {
} }
), ),
expect { tx: ServiceToClientEvent.Transaction -> expect { tx: ServiceToClientEvent.Transaction ->
require(tx.transaction.tx.inputs.isEmpty()) require(tx.transaction.inputs.isEmpty())
require(tx.transaction.tx.outputs.size == 1) require(tx.transaction.outputs.size == 1)
val signaturePubKeys = tx.transaction.sigs.map { it.by }.toSet() val signaturePubKeys = tx.transaction.mustSign.toSet()
// Only Alice signed // Only Alice signed
require(signaturePubKeys.size == 1) require(signaturePubKeys.size == 1)
require(signaturePubKeys.contains(aliceNode.identity.owningKey)) require(signaturePubKeys.contains(aliceNode.identity.owningKey))
@ -137,9 +137,9 @@ class WalletMonitorClientTests {
} }
), ),
expect { tx: ServiceToClientEvent.Transaction -> expect { tx: ServiceToClientEvent.Transaction ->
require(tx.transaction.tx.inputs.size == 1) require(tx.transaction.inputs.size == 1)
require(tx.transaction.tx.outputs.size == 1) require(tx.transaction.outputs.size == 1)
val signaturePubKeys = tx.transaction.sigs.map { it.by }.toSet() val signaturePubKeys = tx.transaction.mustSign.toSet()
// Alice and Notary signed // Alice and Notary signed
require(signaturePubKeys.size == 2) require(signaturePubKeys.size == 2)
require(signaturePubKeys.contains(aliceNode.identity.owningKey)) require(signaturePubKeys.contains(aliceNode.identity.owningKey))

2
node/src/main/kotlin/com/r3corda/node/services/monitor/Events.kt
View File

@ -1,7 +1,7 @@
package com.r3corda.node.services.monitor package com.r3corda.node.services.monitor
import com.r3corda.core.contracts.* import com.r3corda.core.contracts.*
import com.r3corda.core.transactions.SignedTransaction import com.r3corda.core.transactions.LedgerTransaction
import com.r3corda.node.utilities.AddOrRemove import com.r3corda.node.utilities.AddOrRemove
import java.time.Instant import java.time.Instant
import java.util.* import java.util.*

2
node/src/main/kotlin/com/r3corda/node/services/monitor/WalletMonitorService.kt
View File

@ -11,7 +11,7 @@ import com.r3corda.core.node.services.DEFAULT_SESSION_ID
import com.r3corda.core.node.services.Wallet import com.r3corda.core.node.services.Wallet
import com.r3corda.core.protocols.ProtocolLogic import com.r3corda.core.protocols.ProtocolLogic
import com.r3corda.core.serialization.serialize import com.r3corda.core.serialization.serialize
import com.r3corda.core.transactions.SignedTransaction import com.r3corda.core.transactions.LedgerTransaction
import com.r3corda.core.transactions.TransactionBuilder import com.r3corda.core.transactions.TransactionBuilder
import com.r3corda.core.utilities.loggerFor import com.r3corda.core.utilities.loggerFor
import com.r3corda.node.log import com.r3corda.node.log