ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-11 21:13:08 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

More Fixes to cleanup after GitHub

Browse Source
This commit is contained in:
Katelyn Baker 2018-05-18 17:03:28 +01:00
parent 8925ca8954
commit c84bb7ebe0
6 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bridge/src/main/kotlin/net/corda/bridge/services/receiver/BridgeAMQPListenerServiceImpl.kt
View File

@ -69,8 +69,8 @@ class BridgeAMQPListenerServiceImpl(val conf: BridgeConfiguration,
keyStorePrivateKeyPassword, keyStorePrivateKeyPassword,
trustStore, trustStore,
conf.crlCheckSoftFail, conf.crlCheckSoftFail,
conf.enableAMQPPacketTrace, maxMessageSize,
maxMessageSize) conf.enableAMQPPacketTrace)
onConnectSubscription = server.onConnection.subscribe(_onConnection) onConnectSubscription = server.onConnection.subscribe(_onConnection)
onConnectAuditSubscription = server.onConnection.subscribe { onConnectAuditSubscription = server.onConnection.subscribe {
if (it.connected) { if (it.connected) {

4
bridge/src/main/kotlin/net/corda/bridge/services/receiver/FloatControlListenerService.kt
View File

@ -91,8 +91,8 @@ class FloatControlListenerService(val conf: BridgeConfiguration,
keyStorePrivateKeyPassword, keyStorePrivateKeyPassword,
trustStore, trustStore,
conf.crlCheckSoftFail, conf.crlCheckSoftFail,
conf.enableAMQPPacketTrace, maxMessageSize,
maxMessageSize) conf.enableAMQPPacketTrace)
connectSubscriber = controlServer.onConnection.subscribe { onConnectToControl(it) } connectSubscriber = controlServer.onConnection.subscribe { onConnectToControl(it) }
receiveSubscriber = controlServer.onReceive.subscribe { onControlMessage(it) } receiveSubscriber = controlServer.onReceive.subscribe { onControlMessage(it) }
amqpControlServer = controlServer amqpControlServer = controlServer

4
bridge/src/main/kotlin/net/corda/bridge/services/receiver/TunnelingBridgeReceiverService.kt
View File

@ -81,8 +81,8 @@ class TunnelingBridgeReceiverService(val conf: BridgeConfiguration,
controLinkKeyStorePrivateKeyPassword, controLinkKeyStorePrivateKeyPassword,
controlLinkTrustStore, controlLinkTrustStore,
conf.crlCheckSoftFail, conf.crlCheckSoftFail,
conf.enableAMQPPacketTrace, maxMessageSize,
maxMessageSize = maxMessageSize) conf.enableAMQPPacketTrace)
connectSubscriber = controlClient.onConnection.subscribe { onConnectToControl(it) } connectSubscriber = controlClient.onConnection.subscribe { onConnectToControl(it) }
receiveSubscriber = controlClient.onReceive.subscribe { onFloatMessage(it) } receiveSubscriber = controlClient.onReceive.subscribe { onFloatMessage(it) }
amqpControlClient = controlClient amqpControlClient = controlClient

11
network-management/src/test/kotlin/com/r3/corda/networkmanage/CertificateRevocationListNodeTests.kt
View File

@ -8,10 +8,7 @@ import net.corda.nodeapi.internal.crypto.X509KeyStore
import net.corda.nodeapi.internal.protonwrapper.messages.MessageStatus import net.corda.nodeapi.internal.protonwrapper.messages.MessageStatus
import net.corda.nodeapi.internal.protonwrapper.netty.AMQPClient import net.corda.nodeapi.internal.protonwrapper.netty.AMQPClient
import net.corda.nodeapi.internal.protonwrapper.netty.AMQPServer import net.corda.nodeapi.internal.protonwrapper.netty.AMQPServer
import net.corda.testing.core.ALICE_NAME import net.corda.testing.core.*
import net.corda.testing.core.BOB_NAME
import net.corda.testing.core.CHARLIE_NAME
import net.corda.testing.core.freePort
import org.bouncycastle.jce.provider.BouncyCastleProvider import org.bouncycastle.jce.provider.BouncyCastleProvider
import org.junit.Before import org.junit.Before
import org.junit.Ignore import org.junit.Ignore
@ -89,7 +86,8 @@ class CertificateRevocationListNodeTests {
sslS, sslS,
"cordacadevpass", "cordacadevpass",
tS, tS,
false) false,
MAX_MESSAGE_SIZE)
} }
private fun createServer(port: Int): AMQPServer { private fun createServer(port: Int): AMQPServer {
@ -103,6 +101,7 @@ class CertificateRevocationListNodeTests {
sslS, sslS,
"cordacadevpass", "cordacadevpass",
tS, tS,
false) false,
MAX_MESSAGE_SIZE)
} }
} }

4
node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt
View File

@ -67,10 +67,10 @@ class AMQPClient(val targets: List<NetworkHostAndPort>,
private val keyStorePrivateKeyPassword: String, private val keyStorePrivateKeyPassword: String,
private val trustStore: KeyStore, private val trustStore: KeyStore,
private val crlCheckSoftFail: Boolean, private val crlCheckSoftFail: Boolean,
private val maxMessageSize: Int,
private val trace: Boolean = false, private val trace: Boolean = false,
private val sharedThreadPool: EventLoopGroup? = null, private val sharedThreadPool: EventLoopGroup? = null,
private val socksProxyConfig: SocksProxyConfig? = null, private val socksProxyConfig: SocksProxyConfig? = null) : AutoCloseable {
private val maxMessageSize: Int) : AutoCloseable {
companion object { companion object {
init { init {
InternalLoggerFactory.setDefaultFactory(Slf4JLoggerFactory.INSTANCE) InternalLoggerFactory.setDefaultFactory(Slf4JLoggerFactory.INSTANCE)

8
node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPServer.kt
View File

@ -52,8 +52,8 @@ class AMQPServer(val hostName: String,
private val keyStorePrivateKeyPassword: CharArray, private val keyStorePrivateKeyPassword: CharArray,
private val trustStore: KeyStore, private val trustStore: KeyStore,
private val crlCheckSoftFail: Boolean, private val crlCheckSoftFail: Boolean,
private val trace: Boolean = false, private val maxMessageSize: Int,
private val maxMessageSize: Int) : AutoCloseable { private val trace: Boolean = false) : AutoCloseable {
companion object { companion object {
init { init {
@ -80,8 +80,8 @@ class AMQPServer(val hostName: String,
keyStorePrivateKeyPassword: String, keyStorePrivateKeyPassword: String,
trustStore: KeyStore, trustStore: KeyStore,
crlCheckSoftFail: Boolean, crlCheckSoftFail: Boolean,
trace: Boolean = false, maxMessageSize: Int,
maxMessageSize: Int) : this(hostName, port, userName, password, keyStore, keyStorePrivateKeyPassword.toCharArray(), trustStore, crlCheckSoftFail, trace, maxMessageSize) trace: Boolean = false) : this(hostName, port, userName, password, keyStore, keyStorePrivateKeyPassword.toCharArray(), trustStore, crlCheckSoftFail, maxMessageSize, trace)
private class ServerChannelInitializer(val parent: AMQPServer) : ChannelInitializer<SocketChannel>() { private class ServerChannelInitializer(val parent: AMQPServer) : ChannelInitializer<SocketChannel>() {
private val keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()) private val keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm())