From d3f956ab601b5873395ee84b507d3ee4360ee65b Mon Sep 17 00:00:00 2001 From: Andras Slemmer Date: Fri, 17 Mar 2017 12:27:25 +0000 Subject: [PATCH] Address PR 379 comments --- .../corda/client/model/NodeMonitorModel.kt | 2 +- node-api/build.gradle | 8 ++++-- .../{node => nodeapi}/ArtemisTcpTransport.kt | 18 ++++++------- .../{ => nodeapi}/config/ConfigUtilities.kt | 3 +-- .../{ => nodeapi}/config/SSLConfiguration.kt | 2 +- .../services/messaging/MQSecurityTest.kt | 2 +- .../kotlin/net/corda/node/driver/Driver.kt | 2 +- .../node/services/config/ConfigUtilities.kt | 2 +- .../node/services/config/NodeConfiguration.kt | 8 +++--- .../messaging/ArtemisMessagingComponent.kt | 2 +- .../messaging/ArtemisMessagingServer.kt | 27 +++++++++++-------- .../node/services/messaging/CordaRPCClient.kt | 6 ++--- .../services/messaging/NodeMessagingClient.kt | 4 +-- .../transactions/RaftUniquenessProvider.kt | 2 +- .../corda/attachmentdemo/AttachmentDemo.kt | 2 +- .../kotlin/net/corda/notarydemo/NotaryDemo.kt | 2 +- .../kotlin/net/corda/traderdemo/TraderDemo.kt | 2 +- .../kotlin/net/corda/testing/CoreTestUtils.kt | 2 +- .../corda/testing/messaging/SimpleMQClient.kt | 6 ++--- .../net/corda/loadtest/ConnectionManager.kt | 2 +- .../corda/loadtest/LoadTestConfiguration.kt | 2 +- 21 files changed, 57 insertions(+), 49 deletions(-) rename node-api/src/main/kotlin/net/corda/{node => nodeapi}/ArtemisTcpTransport.kt (87%) rename node-api/src/main/kotlin/net/corda/{ => nodeapi}/config/ConfigUtilities.kt (98%) rename node-api/src/main/kotlin/net/corda/{ => nodeapi}/config/SSLConfiguration.kt (90%) diff --git a/client/src/main/kotlin/net/corda/client/model/NodeMonitorModel.kt b/client/src/main/kotlin/net/corda/client/model/NodeMonitorModel.kt index 1f058bd3b7..4974578ff6 100644 --- a/client/src/main/kotlin/net/corda/client/model/NodeMonitorModel.kt +++ b/client/src/main/kotlin/net/corda/client/model/NodeMonitorModel.kt @@ -2,7 +2,7 @@ package net.corda.client.model import com.google.common.net.HostAndPort import javafx.beans.property.SimpleObjectProperty -import net.corda.config.SSLConfiguration +import net.corda.nodeapi.config.SSLConfiguration import net.corda.core.flows.StateMachineRunId import net.corda.core.messaging.CordaRPCOps import net.corda.core.messaging.StateMachineInfo diff --git a/node-api/build.gradle b/node-api/build.gradle index c2f05ad11f..5e2e748f1c 100644 --- a/node-api/build.gradle +++ b/node-api/build.gradle @@ -42,11 +42,15 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" compile "org.jetbrains.kotlinx:kotlinx-support-jdk8:0.3" compile "org.jetbrains.kotlin:kotlin-test:$kotlin_version" - compile "org.apache.activemq:artemis-server:${artemis_version}" compile "org.apache.activemq:artemis-core-client:${artemis_version}" compile "org.apache.activemq:artemis-commons:${artemis_version}" - runtime "org.apache.activemq:artemis-amqp-protocol:${artemis_version}" // TypeSafe Config: for simple and human friendly config files. compile "com.typesafe:config:$typesafe_config_version" } + +configurations.compile { + // We want to use SLF4J's version of these binding: jcl-over-slf4j + // Remove any transitive dependency on Apache's version. + exclude group: 'commons-logging', module: 'commons-logging' +} \ No newline at end of file diff --git a/node-api/src/main/kotlin/net/corda/node/ArtemisTcpTransport.kt b/node-api/src/main/kotlin/net/corda/nodeapi/ArtemisTcpTransport.kt similarity index 87% rename from node-api/src/main/kotlin/net/corda/node/ArtemisTcpTransport.kt rename to node-api/src/main/kotlin/net/corda/nodeapi/ArtemisTcpTransport.kt index df80da2d4d..83b7157238 100644 --- a/node-api/src/main/kotlin/net/corda/node/ArtemisTcpTransport.kt +++ b/node-api/src/main/kotlin/net/corda/nodeapi/ArtemisTcpTransport.kt @@ -1,17 +1,19 @@ -package net.corda.node +package net.corda.nodeapi import com.google.common.net.HostAndPort -import net.corda.config.SSLConfiguration +import net.corda.nodeapi.config.SSLConfiguration import org.apache.activemq.artemis.api.core.TransportConfiguration -import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants import java.nio.file.FileSystems import java.nio.file.Path sealed class ConnectionDirection { - object Inbound : ConnectionDirection() - class Outbound(val expectedCommonName: String? = null) : ConnectionDirection() + class Inbound(val acceptorFactoryClassName: String) : ConnectionDirection() + class Outbound( + val expectedCommonName: String? = null, + val connectorFactoryClassName: String = NettyConnectorFactory::class.java.name + ) : ConnectionDirection() } class ArtemisTcpTransport { @@ -35,8 +37,6 @@ class ArtemisTcpTransport { direction: ConnectionDirection, hostAndPort: HostAndPort, config: SSLConfiguration?, - acceptorFactoryClassName: String = NettyAcceptorFactory::class.java.name, - connectorFactoryClassName: String = NettyConnectorFactory::class.java.name, enableSSL: Boolean = true ): TransportConfiguration { val options = mutableMapOf( @@ -72,8 +72,8 @@ class ArtemisTcpTransport { options.putAll(tlsOptions) } val factoryName = when (direction) { - is ConnectionDirection.Inbound -> acceptorFactoryClassName - is ConnectionDirection.Outbound -> connectorFactoryClassName + is ConnectionDirection.Inbound -> direction.acceptorFactoryClassName + is ConnectionDirection.Outbound -> direction.connectorFactoryClassName } return TransportConfiguration(factoryName, options) } diff --git a/node-api/src/main/kotlin/net/corda/config/ConfigUtilities.kt b/node-api/src/main/kotlin/net/corda/nodeapi/config/ConfigUtilities.kt similarity index 98% rename from node-api/src/main/kotlin/net/corda/config/ConfigUtilities.kt rename to node-api/src/main/kotlin/net/corda/nodeapi/config/ConfigUtilities.kt index d68b050bb3..c1392c71af 100644 --- a/node-api/src/main/kotlin/net/corda/config/ConfigUtilities.kt +++ b/node-api/src/main/kotlin/net/corda/nodeapi/config/ConfigUtilities.kt @@ -1,9 +1,8 @@ -package net.corda.config +package net.corda.nodeapi.config import com.google.common.net.HostAndPort import com.typesafe.config.Config import java.net.URL -import java.nio.file.FileSystems import java.nio.file.Path import java.nio.file.Paths import java.time.Instant diff --git a/node-api/src/main/kotlin/net/corda/config/SSLConfiguration.kt b/node-api/src/main/kotlin/net/corda/nodeapi/config/SSLConfiguration.kt similarity index 90% rename from node-api/src/main/kotlin/net/corda/config/SSLConfiguration.kt rename to node-api/src/main/kotlin/net/corda/nodeapi/config/SSLConfiguration.kt index a8fcde91d6..2832f783db 100644 --- a/node-api/src/main/kotlin/net/corda/config/SSLConfiguration.kt +++ b/node-api/src/main/kotlin/net/corda/nodeapi/config/SSLConfiguration.kt @@ -1,4 +1,4 @@ -package net.corda.config +package net.corda.nodeapi.config import net.corda.core.div import java.nio.file.Path diff --git a/node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt b/node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt index cfdbc321e7..7daa3ad8b3 100644 --- a/node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt +++ b/node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt @@ -2,7 +2,7 @@ package net.corda.services.messaging import co.paralleluniverse.fibers.Suspendable import com.google.common.net.HostAndPort -import net.corda.config.SSLConfiguration +import net.corda.nodeapi.config.SSLConfiguration import net.corda.core.crypto.Party import net.corda.core.crypto.composite import net.corda.core.crypto.generateKeyPair diff --git a/node/src/main/kotlin/net/corda/node/driver/Driver.kt b/node/src/main/kotlin/net/corda/node/driver/Driver.kt index c60cbfdb26..78daed52dc 100644 --- a/node/src/main/kotlin/net/corda/node/driver/Driver.kt +++ b/node/src/main/kotlin/net/corda/node/driver/Driver.kt @@ -8,7 +8,7 @@ import com.google.common.util.concurrent.ListenableFuture import com.google.common.util.concurrent.SettableFuture import com.typesafe.config.Config import com.typesafe.config.ConfigRenderOptions -import net.corda.config.SSLConfiguration +import net.corda.nodeapi.config.SSLConfiguration import net.corda.core.* import net.corda.core.crypto.Party import net.corda.core.messaging.CordaRPCOps diff --git a/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt b/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt index 3fb5513ea1..8665e1ea1d 100644 --- a/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt +++ b/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt @@ -7,7 +7,7 @@ import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import com.typesafe.config.ConfigParseOptions import com.typesafe.config.ConfigRenderOptions -import net.corda.config.SSLConfiguration +import net.corda.nodeapi.config.SSLConfiguration import net.corda.core.copyTo import net.corda.core.createDirectories import net.corda.core.crypto.X509Utilities diff --git a/node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt b/node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt index 942e5a0cfb..770739f466 100644 --- a/node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt +++ b/node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt @@ -2,10 +2,10 @@ package net.corda.node.services.config import com.google.common.net.HostAndPort import com.typesafe.config.Config -import net.corda.config.SSLConfiguration -import net.corda.config.getListOrElse -import net.corda.config.getOrElse -import net.corda.config.getValue +import net.corda.nodeapi.config.SSLConfiguration +import net.corda.nodeapi.config.getListOrElse +import net.corda.nodeapi.config.getOrElse +import net.corda.nodeapi.config.getValue import net.corda.core.div import net.corda.core.node.NodeVersionInfo import net.corda.core.node.services.ServiceInfo diff --git a/node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingComponent.kt b/node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingComponent.kt index 6e4fe2401a..7de69c26d9 100644 --- a/node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingComponent.kt +++ b/node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingComponent.kt @@ -2,7 +2,7 @@ package net.corda.node.services.messaging import com.google.common.annotations.VisibleForTesting import com.google.common.net.HostAndPort -import net.corda.config.SSLConfiguration +import net.corda.nodeapi.config.SSLConfiguration import net.corda.core.crypto.CompositeKey import net.corda.core.messaging.MessageRecipientGroup import net.corda.core.messaging.MessageRecipients diff --git a/node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingServer.kt b/node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingServer.kt index fa6f043843..83456c525e 100644 --- a/node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingServer.kt +++ b/node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingServer.kt @@ -16,9 +16,9 @@ import net.corda.core.node.services.NetworkMapCache.MapChange import net.corda.core.seconds import net.corda.core.utilities.debug import net.corda.core.utilities.loggerFor -import net.corda.node.ArtemisTcpTransport -import net.corda.node.ConnectionDirection -import net.corda.node.expectedOnDefaultFileSystem +import net.corda.nodeapi.ArtemisTcpTransport +import net.corda.nodeapi.ConnectionDirection +import net.corda.nodeapi.expectedOnDefaultFileSystem import net.corda.node.printBasicNodeInfo import net.corda.node.services.RPCUserService import net.corda.node.services.config.NodeConfiguration @@ -34,6 +34,7 @@ import org.apache.activemq.artemis.core.config.Configuration import org.apache.activemq.artemis.core.config.CoreQueueConfiguration import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl import org.apache.activemq.artemis.core.config.impl.SecurityConfiguration +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnection import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnector import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory @@ -152,9 +153,12 @@ class ArtemisMessagingServer(override val config: NodeConfiguration, bindingsDirectory = (artemisDir / "bindings").toString() journalDirectory = (artemisDir / "journal").toString() largeMessagesDirectory = (artemisDir / "large-messages").toString() - val acceptors = mutableSetOf(verifyingTcpTransport(ConnectionDirection.Inbound, "0.0.0.0", p2pHostPort.port)) + val connectionDirection = ConnectionDirection.Inbound( + acceptorFactoryClassName = NettyAcceptorFactory::class.java.name + ) + val acceptors = mutableSetOf(createTcpTransport(connectionDirection, "0.0.0.0", p2pHostPort.port)) if (rpcHostPort != null) { - acceptors.add(verifyingTcpTransport(ConnectionDirection.Inbound, "0.0.0.0", rpcHostPort.port, enableSSL = false)) + acceptors.add(createTcpTransport(connectionDirection, "0.0.0.0", rpcHostPort.port, enableSSL = false)) } acceptorConfigurations = acceptors // Enable built in message deduplication. Note we still have to do our own as the delayed commits @@ -328,11 +332,8 @@ class ArtemisMessagingServer(override val config: NodeConfiguration, deployBridge(address.queueName, address.hostAndPort, legalName) } - private fun verifyingTcpTransport(direction: ConnectionDirection, host: String, port: Int, enableSSL: Boolean = true) = - ArtemisTcpTransport.tcpTransport(direction, HostAndPort.fromParts(host, port), config, - enableSSL = enableSSL, - connectorFactoryClassName = VerifyingNettyConnectorFactory::class.java.name - ) + private fun createTcpTransport(connectionDirection: ConnectionDirection, host: String, port: Int, enableSSL: Boolean = true) = + ArtemisTcpTransport.tcpTransport(connectionDirection, HostAndPort.fromParts(host, port), config, enableSSL = enableSSL) /** * All nodes are expected to have a public facing address called [ArtemisMessagingComponent.P2P_QUEUE] for receiving @@ -341,7 +342,11 @@ class ArtemisMessagingServer(override val config: NodeConfiguration, * P2P address. */ private fun deployBridge(queueName: String, target: HostAndPort, legalName: String) { - val tcpTransport = verifyingTcpTransport(ConnectionDirection.Outbound(expectedCommonName = legalName), target.hostText, target.port) + val connectionDirection = ConnectionDirection.Outbound( + connectorFactoryClassName = VerifyingNettyConnectorFactory::class.java.name, + expectedCommonName = legalName + ) + val tcpTransport = createTcpTransport(connectionDirection, target.hostText, target.port) tcpTransport.params[ArtemisMessagingServer::class.java.name] = this // We intentionally overwrite any previous connector config in case the peer legal name changed activeMQServer.configuration.addConnectorConfiguration(target.toString(), tcpTransport) diff --git a/node/src/main/kotlin/net/corda/node/services/messaging/CordaRPCClient.kt b/node/src/main/kotlin/net/corda/node/services/messaging/CordaRPCClient.kt index d9f4e2a2ab..1d51c03f9f 100644 --- a/node/src/main/kotlin/net/corda/node/services/messaging/CordaRPCClient.kt +++ b/node/src/main/kotlin/net/corda/node/services/messaging/CordaRPCClient.kt @@ -1,15 +1,15 @@ package net.corda.node.services.messaging import com.google.common.net.HostAndPort -import net.corda.config.SSLConfiguration +import net.corda.nodeapi.config.SSLConfiguration import net.corda.core.ThreadBox import net.corda.core.logElapsedTime import net.corda.core.messaging.CordaRPCOps import net.corda.core.minutes import net.corda.core.seconds import net.corda.core.utilities.loggerFor -import net.corda.node.ArtemisTcpTransport.Companion.tcpTransport -import net.corda.node.ConnectionDirection +import net.corda.nodeapi.ArtemisTcpTransport.Companion.tcpTransport +import net.corda.nodeapi.ConnectionDirection import org.apache.activemq.artemis.api.core.ActiveMQException import org.apache.activemq.artemis.api.core.client.ActiveMQClient import org.apache.activemq.artemis.api.core.client.ClientSession diff --git a/node/src/main/kotlin/net/corda/node/services/messaging/NodeMessagingClient.kt b/node/src/main/kotlin/net/corda/node/services/messaging/NodeMessagingClient.kt index a8fb3f250e..b71472dee0 100644 --- a/node/src/main/kotlin/net/corda/node/services/messaging/NodeMessagingClient.kt +++ b/node/src/main/kotlin/net/corda/node/services/messaging/NodeMessagingClient.kt @@ -12,8 +12,8 @@ import net.corda.core.serialization.opaque import net.corda.core.success import net.corda.core.utilities.loggerFor import net.corda.core.utilities.trace -import net.corda.node.ArtemisTcpTransport -import net.corda.node.ConnectionDirection +import net.corda.nodeapi.ArtemisTcpTransport +import net.corda.nodeapi.ConnectionDirection import net.corda.node.services.RPCUserService import net.corda.node.services.api.MessagingServiceInternal import net.corda.node.services.config.NodeConfiguration diff --git a/node/src/main/kotlin/net/corda/node/services/transactions/RaftUniquenessProvider.kt b/node/src/main/kotlin/net/corda/node/services/transactions/RaftUniquenessProvider.kt index f62c012727..90dad60377 100644 --- a/node/src/main/kotlin/net/corda/node/services/transactions/RaftUniquenessProvider.kt +++ b/node/src/main/kotlin/net/corda/node/services/transactions/RaftUniquenessProvider.kt @@ -20,7 +20,7 @@ import net.corda.core.serialization.SingletonSerializeAsToken import net.corda.core.serialization.deserialize import net.corda.core.serialization.serialize import net.corda.core.utilities.loggerFor -import net.corda.config.SSLConfiguration +import net.corda.nodeapi.config.SSLConfiguration import org.jetbrains.exposed.sql.Database import java.nio.file.Path import java.util.concurrent.CompletableFuture diff --git a/samples/attachment-demo/src/main/kotlin/net/corda/attachmentdemo/AttachmentDemo.kt b/samples/attachment-demo/src/main/kotlin/net/corda/attachmentdemo/AttachmentDemo.kt index 70740eb869..83d4d6daeb 100644 --- a/samples/attachment-demo/src/main/kotlin/net/corda/attachmentdemo/AttachmentDemo.kt +++ b/samples/attachment-demo/src/main/kotlin/net/corda/attachmentdemo/AttachmentDemo.kt @@ -2,7 +2,7 @@ package net.corda.attachmentdemo import com.google.common.net.HostAndPort import joptsimple.OptionParser -import net.corda.config.SSLConfiguration +import net.corda.nodeapi.config.SSLConfiguration import net.corda.core.contracts.TransactionType import net.corda.core.crypto.Party import net.corda.core.crypto.SecureHash diff --git a/samples/raft-notary-demo/src/main/kotlin/net/corda/notarydemo/NotaryDemo.kt b/samples/raft-notary-demo/src/main/kotlin/net/corda/notarydemo/NotaryDemo.kt index 5cd625baa5..fc50b7c33d 100644 --- a/samples/raft-notary-demo/src/main/kotlin/net/corda/notarydemo/NotaryDemo.kt +++ b/samples/raft-notary-demo/src/main/kotlin/net/corda/notarydemo/NotaryDemo.kt @@ -3,7 +3,7 @@ package net.corda.notarydemo import com.google.common.net.HostAndPort import com.google.common.util.concurrent.Futures import joptsimple.OptionParser -import net.corda.config.SSLConfiguration +import net.corda.nodeapi.config.SSLConfiguration import net.corda.core.crypto.toStringShort import net.corda.core.div import net.corda.core.getOrThrow diff --git a/samples/trader-demo/src/main/kotlin/net/corda/traderdemo/TraderDemo.kt b/samples/trader-demo/src/main/kotlin/net/corda/traderdemo/TraderDemo.kt index 2221614bb2..2d96511753 100644 --- a/samples/trader-demo/src/main/kotlin/net/corda/traderdemo/TraderDemo.kt +++ b/samples/trader-demo/src/main/kotlin/net/corda/traderdemo/TraderDemo.kt @@ -2,7 +2,7 @@ package net.corda.traderdemo import com.google.common.net.HostAndPort import joptsimple.OptionParser -import net.corda.config.SSLConfiguration +import net.corda.nodeapi.config.SSLConfiguration import net.corda.core.contracts.DOLLARS import net.corda.core.div import net.corda.core.utilities.loggerFor diff --git a/test-utils/src/main/kotlin/net/corda/testing/CoreTestUtils.kt b/test-utils/src/main/kotlin/net/corda/testing/CoreTestUtils.kt index a934da8856..94f30a5cae 100644 --- a/test-utils/src/main/kotlin/net/corda/testing/CoreTestUtils.kt +++ b/test-utils/src/main/kotlin/net/corda/testing/CoreTestUtils.kt @@ -6,7 +6,7 @@ package net.corda.testing import com.google.common.net.HostAndPort import com.google.common.util.concurrent.ListenableFuture import com.typesafe.config.Config -import net.corda.config.SSLConfiguration +import net.corda.nodeapi.config.SSLConfiguration import net.corda.core.contracts.StateRef import net.corda.core.crypto.* import net.corda.core.flows.FlowLogic diff --git a/test-utils/src/main/kotlin/net/corda/testing/messaging/SimpleMQClient.kt b/test-utils/src/main/kotlin/net/corda/testing/messaging/SimpleMQClient.kt index 218467f352..c06af4b8ea 100644 --- a/test-utils/src/main/kotlin/net/corda/testing/messaging/SimpleMQClient.kt +++ b/test-utils/src/main/kotlin/net/corda/testing/messaging/SimpleMQClient.kt @@ -1,9 +1,9 @@ package net.corda.testing.messaging import com.google.common.net.HostAndPort -import net.corda.config.SSLConfiguration -import net.corda.node.ArtemisTcpTransport -import net.corda.node.ConnectionDirection +import net.corda.nodeapi.config.SSLConfiguration +import net.corda.nodeapi.ArtemisTcpTransport +import net.corda.nodeapi.ConnectionDirection import net.corda.node.services.messaging.ArtemisMessagingComponent import net.corda.testing.configureTestSSL import org.apache.activemq.artemis.api.core.client.* diff --git a/tools/loadtest/src/main/kotlin/net/corda/loadtest/ConnectionManager.kt b/tools/loadtest/src/main/kotlin/net/corda/loadtest/ConnectionManager.kt index 13adca8fa9..26ae933ad5 100644 --- a/tools/loadtest/src/main/kotlin/net/corda/loadtest/ConnectionManager.kt +++ b/tools/loadtest/src/main/kotlin/net/corda/loadtest/ConnectionManager.kt @@ -11,7 +11,7 @@ import net.corda.core.createDirectories import net.corda.core.div import net.corda.core.messaging.CordaRPCOps import net.corda.node.driver.PortAllocation -import net.corda.config.SSLConfiguration +import net.corda.nodeapi.config.SSLConfiguration import net.corda.node.services.messaging.CordaRPCClient import org.slf4j.LoggerFactory import java.io.ByteArrayOutputStream diff --git a/tools/loadtest/src/main/kotlin/net/corda/loadtest/LoadTestConfiguration.kt b/tools/loadtest/src/main/kotlin/net/corda/loadtest/LoadTestConfiguration.kt index 38c90e4799..da7590ce92 100644 --- a/tools/loadtest/src/main/kotlin/net/corda/loadtest/LoadTestConfiguration.kt +++ b/tools/loadtest/src/main/kotlin/net/corda/loadtest/LoadTestConfiguration.kt @@ -1,7 +1,7 @@ package net.corda.loadtest import com.typesafe.config.Config -import net.corda.config.getValue +import net.corda.nodeapi.config.getValue import java.nio.file.Path /**