From 981ae03ac64c845a6070e16fea4f742438e66aaf Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 15 Feb 2015 18:01:22 +0100 Subject: [PATCH] Update to Tomp2p beta3 and back to BitcoinJ 0.12.2 --- build.gradle | 4 ++-- .../java/io/bitsquare/msg/tomp2p/BootstrappedPeerBuilder.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 903fd359fc..9429972904 100644 --- a/build.gradle +++ b/build.gradle @@ -40,8 +40,8 @@ repositories { } dependencies { - compile 'org.bitcoinj:bitcoinj-core:0.13-SNAPSHOT' - compile 'net.tomp2p:tomp2p-all:5.0-Beta2' + compile 'org.bitcoinj:bitcoinj-core:0.12.2' + compile 'net.tomp2p:tomp2p-all:5.0-Beta3' compile 'io.reactivex:rxjava:1.0.0' compile 'org.springframework:spring-core:4.1.1.RELEASE' compile 'net.sf.jopt-simple:jopt-simple:4.8' diff --git a/src/main/java/io/bitsquare/msg/tomp2p/BootstrappedPeerBuilder.java b/src/main/java/io/bitsquare/msg/tomp2p/BootstrappedPeerBuilder.java index 463a757197..1756ba825c 100644 --- a/src/main/java/io/bitsquare/msg/tomp2p/BootstrappedPeerBuilder.java +++ b/src/main/java/io/bitsquare/msg/tomp2p/BootstrappedPeerBuilder.java @@ -55,7 +55,7 @@ import net.tomp2p.peers.Number160; import net.tomp2p.peers.PeerAddress; import net.tomp2p.peers.PeerMapChangeListener; import net.tomp2p.peers.PeerStatistic; -import net.tomp2p.relay.RelayConfig; +import net.tomp2p.relay.tcp.TCPRelayClientConfig; import org.jetbrains.annotations.NotNull; @@ -203,7 +203,7 @@ class BootstrappedPeerBuilder { setState(BootstrapState.DISCOVERY_STARTED, "Starting discovery..."); PeerNAT peerNAT = new PeerBuilderNAT(peer).start(); FutureNAT futureNAT = peerNAT.startSetupPortforwarding(futureDiscover); - FutureRelayNAT futureRelayNAT = peerNAT.startRelay(RelayConfig.OpenTCP(), futureDiscover, futureNAT); + FutureRelayNAT futureRelayNAT = peerNAT.startRelay(new TCPRelayClientConfig(), futureDiscover, futureNAT); futureRelayNAT.addListener(new BaseFutureListener() { @Override