From a589f5e984c81c7b888cc30144168346986ae1e1 Mon Sep 17 00:00:00 2001 From: Anthony Keenan Date: Sun, 28 Oct 2018 14:05:49 +0000 Subject: [PATCH] Revert merge conflicts --- .../kotlin/net/corda/node/flows/AsymmetricCorDappsTests.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/node/src/integration-test/kotlin/net/corda/node/flows/AsymmetricCorDappsTests.kt b/node/src/integration-test/kotlin/net/corda/node/flows/AsymmetricCorDappsTests.kt index d55bba27e5..b1db346d95 100644 --- a/node/src/integration-test/kotlin/net/corda/node/flows/AsymmetricCorDappsTests.kt +++ b/node/src/integration-test/kotlin/net/corda/node/flows/AsymmetricCorDappsTests.kt @@ -54,8 +54,8 @@ class AsymmetricCorDappsTests : IntegrationTest() { @Test fun `no shared cordapps with asymmetric specific classes`() { - driver(DriverParameters(startNodesInProcess = true, cordappsForAllNodes = emptySet())) { - val nodeA = startNode( providedName = ALICE_NAME, additionalCordapps = setOf(cordappForClasses(Ping::class.java))).getOrThrow() + driver(DriverParameters(startNodesInProcess = false, cordappsForAllNodes = emptySet())) { + val nodeA = startNode(providedName = ALICE_NAME, additionalCordapps = setOf(cordappForClasses(Ping::class.java))).getOrThrow() val nodeB = startNode(providedName = BOB_NAME, additionalCordapps = setOf(cordappForClasses(Ping::class.java, Pong::class.java))).getOrThrow() nodeA.rpc.startFlow(::Ping, nodeB.nodeInfo.singleIdentity(), 1).returnValue.getOrThrow() }