diff --git a/client/src/integration-test/kotlin/com/r3corda/client/WalletMonitorClientTests.kt b/client/src/integration-test/kotlin/com/r3corda/client/WalletMonitorClientTests.kt index bc7d228089..007fd885b1 100644 --- a/client/src/integration-test/kotlin/com/r3corda/client/WalletMonitorClientTests.kt +++ b/client/src/integration-test/kotlin/com/r3corda/client/WalletMonitorClientTests.kt @@ -105,9 +105,9 @@ class WalletMonitorClientTests { } ), expect { tx: ServiceToClientEvent.Transaction -> - require(tx.transaction.tx.inputs.isEmpty()) - require(tx.transaction.tx.outputs.size == 1) - val signaturePubKeys = tx.transaction.sigs.map { it.by }.toSet() + require(tx.transaction.inputs.isEmpty()) + require(tx.transaction.outputs.size == 1) + val signaturePubKeys = tx.transaction.mustSign.toSet() // Only Alice signed require(signaturePubKeys.size == 1) require(signaturePubKeys.contains(aliceNode.identity.owningKey)) @@ -137,9 +137,9 @@ class WalletMonitorClientTests { } ), expect { tx: ServiceToClientEvent.Transaction -> - require(tx.transaction.tx.inputs.size == 1) - require(tx.transaction.tx.outputs.size == 1) - val signaturePubKeys = tx.transaction.sigs.map { it.by }.toSet() + require(tx.transaction.inputs.size == 1) + require(tx.transaction.outputs.size == 1) + val signaturePubKeys = tx.transaction.mustSign.toSet() // Alice and Notary signed require(signaturePubKeys.size == 2) require(signaturePubKeys.contains(aliceNode.identity.owningKey)) diff --git a/node/src/main/kotlin/com/r3corda/node/services/monitor/Events.kt b/node/src/main/kotlin/com/r3corda/node/services/monitor/Events.kt index fbcef8de04..3f4ea0b1ca 100644 --- a/node/src/main/kotlin/com/r3corda/node/services/monitor/Events.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/monitor/Events.kt @@ -1,7 +1,7 @@ package com.r3corda.node.services.monitor import com.r3corda.core.contracts.* -import com.r3corda.core.transactions.SignedTransaction +import com.r3corda.core.transactions.LedgerTransaction import com.r3corda.node.utilities.AddOrRemove import java.time.Instant import java.util.* diff --git a/node/src/main/kotlin/com/r3corda/node/services/monitor/WalletMonitorService.kt b/node/src/main/kotlin/com/r3corda/node/services/monitor/WalletMonitorService.kt index ce149bdaf2..f4b30ad9c1 100644 --- a/node/src/main/kotlin/com/r3corda/node/services/monitor/WalletMonitorService.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/monitor/WalletMonitorService.kt @@ -11,7 +11,7 @@ import com.r3corda.core.node.services.DEFAULT_SESSION_ID import com.r3corda.core.node.services.Wallet import com.r3corda.core.protocols.ProtocolLogic 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.utilities.loggerFor import com.r3corda.node.log