From ef598d926fb2244321bd2ec50b1106f6c9adb4e9 Mon Sep 17 00:00:00 2001 From: Andrius Dagys Date: Mon, 28 Nov 2016 15:51:31 +0000 Subject: [PATCH] Include only required atomix dependencies. --- node/build.gradle | 4 +++- .../node/services/transactions/RaftUniquenessProvider.kt | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/node/build.gradle b/node/build.gradle index b337adb429..c5e504e113 100644 --- a/node/build.gradle +++ b/node/build.gradle @@ -151,7 +151,9 @@ dependencies { compile 'co.paralleluniverse:capsule:1.0.3' // Java Atomix: RAFT library - compile 'io.atomix:atomix-all:1.0.0-rc4' + compile 'io.atomix.copycat:copycat-client:1.1.4' + compile 'io.atomix.copycat:copycat-server:1.1.4' + compile 'io.atomix.catalyst:catalyst-netty:1.1.1' // Integration test helpers integrationTestCompile 'junit:junit:4.12' 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 5594fed195..fae5823847 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 @@ -2,9 +2,9 @@ package net.corda.node.services.transactions import com.google.common.net.HostAndPort import io.atomix.catalyst.transport.Address -import io.atomix.catalyst.transport.NettyTransport -import io.atomix.catalyst.transport.SslProtocol import io.atomix.catalyst.transport.Transport +import io.atomix.catalyst.transport.netty.NettyTransport +import io.atomix.catalyst.transport.netty.SslProtocol import io.atomix.copycat.client.CopycatClient import io.atomix.copycat.server.CopycatServer import io.atomix.copycat.server.storage.Storage @@ -78,7 +78,7 @@ class RaftUniquenessProvider(storagePath: Path, myAddress: HostAndPort, clusterA } val client = CopycatClient.builder(address) - .withTransport(transport) + .withTransport(transport) // TODO: use local transport for client-server communications .build() _clientFuture = serverFuture.thenCompose { client.connect(address) } }