Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-07-31 20:11:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Peer: Change getVersionHandshakeFuture() return type back to ListenableFuture<Peer>.

Browse Source
This commit is contained in:
Andreas Schildbach
2016-05-09 17:15:59 +02:00
parent a71da1b859
commit 56f0bcfec5
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/java/org/bitcoinj/core/Peer.java
View File

@@ -160,8 +160,18 @@ public class Peer extends PeerSocketHandler {
private final SettableFuture<Peer> connectionOpenFuture = SettableFuture.create();
private final SettableFuture<Peer> outgoingVersionHandshakeFuture = SettableFuture.create();
private final SettableFuture<Peer> incomingVersionHandshakeFuture = SettableFuture.create();
private final ListenableFuture<List<Peer>> versionHandshakeFuture = Futures
.allAsList(outgoingVersionHandshakeFuture, incomingVersionHandshakeFuture);
private final ListenableFuture<Peer> versionHandshakeFuture = Futures.transform(
Futures.allAsList(outgoingVersionHandshakeFuture, incomingVersionHandshakeFuture),
new Function<List<Peer>, Peer>() {
@Override
@Nullable
public Peer apply(@Nullable List<Peer> peers) {
checkNotNull(peers);
checkState(peers.size() == 2 && peers.get(0) == peers.get(1));
return peers.get(0);
}
});
/**
* <p>Construct a peer that reads/writes from the given block chain.</p>
@@ -436,7 +446,7 @@ public class Peer extends PeerSocketHandler {
return connectionOpenFuture;
}
public ListenableFuture<List<Peer>> getVersionHandshakeFuture() {
public ListenableFuture<Peer> getVersionHandshakeFuture() {
return versionHandshakeFuture;
}