mirror of
https://github.com/corda/corda.git
synced 2025-03-14 00:06:45 +00:00
Post merge cleanup for Max Mem Size
This commit is contained in:
parent
d91f063cbe
commit
1cfc9c6e0c
@ -57,7 +57,7 @@ class SocksTests {
|
||||
|
||||
private abstract class AbstractNodeConfiguration : NodeConfiguration
|
||||
|
||||
private class SocksServer(val port: Int) {
|
||||
private class SocksServer(port: Int) {
|
||||
private val bossGroup = NioEventLoopGroup(1)
|
||||
private val workerGroup = NioEventLoopGroup()
|
||||
private var closeFuture: ChannelFuture? = null
|
||||
@ -314,7 +314,9 @@ class SocksTests {
|
||||
clientKeystore,
|
||||
clientConfig.keyStorePassword,
|
||||
clientTruststore, true,
|
||||
socksProxyConfig = SocksProxyConfig(SocksProxyVersion.SOCKS5, NetworkHostAndPort("127.0.0.1", socksPort), null, null))
|
||||
socksProxyConfig = SocksProxyConfig(SocksProxyVersion.SOCKS5,
|
||||
NetworkHostAndPort("127.0.0.1", socksPort), null, null),
|
||||
maxMessageSize = MAX_MESSAGE_SIZE)
|
||||
}
|
||||
|
||||
private fun createSharedThreadsClient(sharedEventGroup: EventLoopGroup, id: Int): AMQPClient {
|
||||
@ -336,7 +338,9 @@ class SocksTests {
|
||||
clientKeystore,
|
||||
clientConfig.keyStorePassword,
|
||||
clientTruststore, true, true, sharedEventGroup,
|
||||
socksProxyConfig = SocksProxyConfig(SocksProxyVersion.SOCKS5, NetworkHostAndPort("127.0.0.1", socksPort), null, null))
|
||||
socksProxyConfig = SocksProxyConfig(SocksProxyVersion.SOCKS5,
|
||||
NetworkHostAndPort("127.0.0.1", socksPort), null, null),
|
||||
maxMessageSize = MAX_MESSAGE_SIZE)
|
||||
}
|
||||
|
||||
private fun createServer(port: Int, name: CordaX500Name = ALICE_NAME): AMQPServer {
|
||||
@ -358,6 +362,8 @@ class SocksTests {
|
||||
serverKeystore,
|
||||
serverConfig.keyStorePassword,
|
||||
serverTruststore,
|
||||
true)
|
||||
true,
|
||||
false,
|
||||
MAX_MESSAGE_SIZE)
|
||||
}
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
package net.corda.behave.service.proxy
|
||||
|
||||
import net.corda.client.rpc.internal.serialization.kryo.KryoClientSerializationScheme
|
||||
import net.corda.client.rpc.internal.serialization.amqp.AMQPClientSerializationScheme
|
||||
import net.corda.core.concurrent.CordaFuture
|
||||
import net.corda.core.contracts.ContractState
|
||||
import net.corda.core.crypto.SecureHash
|
||||
@ -36,8 +36,8 @@ class CordaRPCProxyClient(private val targetHostAndPort: NetworkHostAndPort) : C
|
||||
|
||||
init {
|
||||
try {
|
||||
KryoClientSerializationScheme.initialiseSerialization()
|
||||
} catch (e: Exception) { log.warn("Kryo RPC Client serialization already initialised.")}
|
||||
AMQPClientSerializationScheme.initialiseSerialization()
|
||||
} catch (e: Exception) { log.warn("AMQP RPC Client serialization already initialised.")}
|
||||
}
|
||||
|
||||
override fun <T> startFlowDynamic(logicType: Class<out FlowLogic<T>>, vararg args: Any?): FlowHandle<T> {
|
||||
|
Loading…
x
Reference in New Issue
Block a user