From 1905f230932d2cf80793232516c7db39cc7d43e6 Mon Sep 17 00:00:00 2001 From: Tudor Malene Date: Thu, 21 Jun 2018 16:51:58 +0100 Subject: [PATCH] fix merge --- .../kotlin/net/corda/node/services/rpc/RpcSslTest.kt | 3 --- .../net/corda/tools/shell/InteractiveShellIntegrationTest.kt | 3 --- 2 files changed, 6 deletions(-) diff --git a/node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt b/node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt index 480f4fb9f0..9f5d46ed27 100644 --- a/node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt +++ b/node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt @@ -31,9 +31,6 @@ import net.corda.testing.driver.internal.RandomFree import net.corda.testing.internal.IntegrationTest import net.corda.testing.internal.IntegrationTestSchemas import net.corda.testing.internal.toDatabaseSchemaName -import net.corda.testing.internal.createKeyPairAndSelfSignedCertificate -import net.corda.testing.internal.saveToKeyStore -import net.corda.testing.internal.saveToTrustStore import net.corda.testing.internal.useSslRpcOverrides import net.corda.testing.node.User import org.apache.activemq.artemis.api.core.ActiveMQException diff --git a/tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt b/tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt index 164553a507..cb9dae45ce 100644 --- a/tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt +++ b/tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt @@ -36,9 +36,6 @@ import net.corda.testing.driver.internal.RandomFree import net.corda.testing.internal.IntegrationTest import net.corda.testing.internal.IntegrationTestSchemas import net.corda.testing.internal.toDatabaseSchemaName -import net.corda.testing.internal.createKeyPairAndSelfSignedCertificate -import net.corda.testing.internal.saveToKeyStore -import net.corda.testing.internal.saveToTrustStore import net.corda.testing.internal.useSslRpcOverrides import net.corda.testing.node.User import org.apache.activemq.artemis.api.core.ActiveMQSecurityException