From 94557c7b887c3f672bd6c77319a378427694987d Mon Sep 17 00:00:00 2001 From: szymonsztuka Date: Tue, 27 Mar 2018 15:04:35 +0100 Subject: [PATCH] Merge remote-tracking branch 'remotes/opensource/master' into merges/drainingmode-integration-tests-27-03-2018 - fix compilation error # Conflicts: # node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt --- .../net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt b/node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt index 85bb9f3db6..350191bf68 100644 --- a/node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt +++ b/node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt @@ -20,9 +20,7 @@ import net.corda.core.utilities.getOrThrow import net.corda.core.utilities.loggerFor import net.corda.core.utilities.unwrap import net.corda.node.services.Permissions -import net.corda.testing.core.ALICE_NAME -import net.corda.testing.core.BOB_NAME -import net.corda.testing.core.singleIdentity +import net.corda.testing.core.* import net.corda.testing.driver.DriverParameters import net.corda.testing.driver.PortAllocation import net.corda.testing.driver.driver