From 2463cbd416efbc5425d4fbcbf2c33426b0855ef4 Mon Sep 17 00:00:00 2001 From: Katelyn Baker Date: Mon, 23 Oct 2017 16:23:12 +0100 Subject: [PATCH] CORDA-435 - AMQP enablement fixes AMQP has different serialization rules than Kryo surrounding the way we introspect objects to work out how to construct them --- .../services/vault/VaultSoftLockManagerTest.kt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/node/src/test/kotlin/net/corda/node/services/vault/VaultSoftLockManagerTest.kt b/node/src/test/kotlin/net/corda/node/services/vault/VaultSoftLockManagerTest.kt index 48a8347969..341accf002 100644 --- a/node/src/test/kotlin/net/corda/node/services/vault/VaultSoftLockManagerTest.kt +++ b/node/src/test/kotlin/net/corda/node/services/vault/VaultSoftLockManagerTest.kt @@ -40,7 +40,7 @@ import java.util.concurrent.atomic.AtomicBoolean import kotlin.reflect.jvm.jvmName import kotlin.test.assertEquals -private class NodePair(private val mockNet: MockNetwork) { +class NodePair(private val mockNet: MockNetwork) { private class ServerLogic(private val session: FlowSession, private val running: AtomicBoolean) : FlowLogic() { @Suspendable override fun call() { @@ -103,8 +103,8 @@ class VaultSoftLockManagerTest { mockNet.stopNodes() } - private object CommandDataImpl : CommandData - private class ClientLogic(nodePair: NodePair, private val state: ContractState) : NodePair.AbstractClientLogic>(nodePair) { + object CommandDataImpl : CommandData + class ClientLogic(nodePair: NodePair, val state: ContractState) : NodePair.AbstractClientLogic>(nodePair) { override fun callImpl() = run { subFlow(FinalityFlow(serviceHub.signInitialTransaction(TransactionBuilder(notary = ourIdentity).apply { addOutputState(state, ContractImpl::class.jvmName) @@ -116,12 +116,15 @@ class VaultSoftLockManagerTest { } } - private abstract class SingleParticipantState(nodePair: NodePair) : ContractState { - override val participants = listOf(nodePair.client.info.chooseIdentity()) + private abstract class ParticipantState(override val participants: List) : ContractState + + private class PlainOldState(participants: List) : ParticipantState(participants) { + constructor(nodePair: NodePair) : this(listOf(nodePair.client.info.chooseIdentity())) } - private class PlainOldState(nodePair: NodePair) : SingleParticipantState(nodePair) - private class FungibleAssetImpl(nodePair: NodePair) : SingleParticipantState(nodePair), FungibleAsset { + private class FungibleAssetImpl(participants: List) : ParticipantState(participants), FungibleAsset { + constructor(nodePair: NodePair) : this(listOf(nodePair.client.info.chooseIdentity())) + override val owner get() = participants[0] override fun withNewOwner(newOwner: AbstractParty) = throw UnsupportedOperationException() override val amount get() = Amount(1, Issued(PartyAndReference(owner, OpaqueBytes.of(1)), Unit))