ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-02 23:50:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Include only required atomix dependencies.

Browse Source
This commit is contained in:
Andrius Dagys 2016-11-28 15:51:31 +00:00
parent a26ca37168
commit ef598d926f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
node/build.gradle
View File

@ -151,7 +151,9 @@ dependencies {
compile 'co.paralleluniverse:capsule:1.0.3' compile 'co.paralleluniverse:capsule:1.0.3'
// Java Atomix: RAFT library // 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 // Integration test helpers
integrationTestCompile 'junit:junit:4.12' integrationTestCompile 'junit:junit:4.12'

6
node/src/main/kotlin/net/corda/node/services/transactions/RaftUniquenessProvider.kt
View File

@ -2,9 +2,9 @@ package net.corda.node.services.transactions
import com.google.common.net.HostAndPort import com.google.common.net.HostAndPort
import io.atomix.catalyst.transport.Address 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.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.client.CopycatClient
import io.atomix.copycat.server.CopycatServer import io.atomix.copycat.server.CopycatServer
import io.atomix.copycat.server.storage.Storage import io.atomix.copycat.server.storage.Storage
@ -78,7 +78,7 @@ class RaftUniquenessProvider(storagePath: Path, myAddress: HostAndPort, clusterA
} }
val client = CopycatClient.builder(address) val client = CopycatClient.builder(address)
.withTransport(transport) .withTransport(transport) // TODO: use local transport for client-server communications
.build() .build()
_clientFuture = serverFuture.thenCompose { client.connect(address) } _clientFuture = serverFuture.thenCompose { client.connect(address) }
} }