ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-14 08:16:32 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Post merge cleanup for Max Mem Size

Browse Source
This commit is contained in:
Katelyn Baker 2018-05-18 09:54:56 +01:00
parent d91f063cbe
commit 1cfc9c6e0c
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
node/src/integration-test/kotlin/net/corda/node/amqp/SocksTests.kt
View File

@ -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)
}
}

6
testing/qa/behave/tools/rpc-proxy/src/main/kotlin/net/corda/behave/service/proxy/CordaRPCProxyClient.kt
View File

@ -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> {