From 4818c77669e3af5e99f37cc1cc86e45edf64a6f9 Mon Sep 17 00:00:00 2001 From: Stefano Franz Date: Fri, 26 Oct 2018 12:02:52 +0100 Subject: [PATCH] fix merge conflict with additionalCordapps in DriverDSLImpl --- .../kotlin/net/corda/node/flows/AsymmetricCorDappsTests.kt | 4 ++-- .../kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 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 0a99283ca8..3f522f8087 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 = false, cordappsForAllNodes = emptySet())) { - val nodeA = startNode(providedName = ALICE_NAME, additionalCordapps = setOf(cordappForClasses(Ping::class.java))).getOrThrow() + driver(DriverParameters(startNodesInProcess = true, 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() } diff --git a/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt b/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt index 0b835f4669..894b94a60a 100644 --- a/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt +++ b/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt @@ -233,8 +233,8 @@ class DriverDSLImpl( customOverrides, startInSameProcess, maximumHeapSize, - defaultParameters.additionalCordapps, - defaultParameters.regenerateCordappsOnStart, + additionalCordapps, + regenerateCordappsOnStart, flowOverrides, null )