Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-07-22 22:51:02 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update to Tomp2p beta3 and back to BitcoinJ 0.12.2

Browse source
This commit is contained in:
Manfred Karrer 2015-02-15 18:01:22 +01:00
parent 309cda7143
commit 981ae03ac6
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -40,8 +40,8 @@ repositories {
} }
dependencies { dependencies {
compile 'org.bitcoinj:bitcoinj-core:0.13-SNAPSHOT' compile 'org.bitcoinj:bitcoinj-core:0.12.2'
compile 'net.tomp2p:tomp2p-all:5.0-Beta2' compile 'net.tomp2p:tomp2p-all:5.0-Beta3'
compile 'io.reactivex:rxjava:1.0.0' compile 'io.reactivex:rxjava:1.0.0'
compile 'org.springframework:spring-core:4.1.1.RELEASE' compile 'org.springframework:spring-core:4.1.1.RELEASE'
compile 'net.sf.jopt-simple:jopt-simple:4.8' compile 'net.sf.jopt-simple:jopt-simple:4.8'

4
src/main/java/io/bitsquare/msg/tomp2p/BootstrappedPeerBuilder.java
View file

@ -55,7 +55,7 @@ import net.tomp2p.peers.Number160;
import net.tomp2p.peers.PeerAddress; import net.tomp2p.peers.PeerAddress;
import net.tomp2p.peers.PeerMapChangeListener; import net.tomp2p.peers.PeerMapChangeListener;
import net.tomp2p.peers.PeerStatistic; import net.tomp2p.peers.PeerStatistic;
import net.tomp2p.relay.RelayConfig; import net.tomp2p.relay.tcp.TCPRelayClientConfig;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -203,7 +203,7 @@ class BootstrappedPeerBuilder {
setState(BootstrapState.DISCOVERY_STARTED, "Starting discovery..."); setState(BootstrapState.DISCOVERY_STARTED, "Starting discovery...");
PeerNAT peerNAT = new PeerBuilderNAT(peer).start(); PeerNAT peerNAT = new PeerBuilderNAT(peer).start();
FutureNAT futureNAT = peerNAT.startSetupPortforwarding(futureDiscover); 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<BaseFuture>() { futureRelayNAT.addListener(new BaseFutureListener<BaseFuture>() {
@Override @Override