mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-03-10 17:26:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

TransactionBroadcast: rename private future to seenFuture, add comments

Browse source
This commit is contained in:
Sean Gilligan 2022-07-28 16:17:01 -07:00 • committed by Andreas Schildbach
parent adb6bcc921
commit 5a1536df3b
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/src/main/java/org/bitcoinj/core/TransactionBroadcast.java
View file

@ -49,7 +49,8 @@ import static com.google.common.base.Preconditions.checkState;
public class TransactionBroadcast { public class TransactionBroadcast {
private static final Logger log = LoggerFactory.getLogger(TransactionBroadcast.class); private static final Logger log = LoggerFactory.getLogger(TransactionBroadcast.class);
private final CompletableFuture<Transaction> future = new ListenableCompletableFuture<>(); // This future completes when we have verified that more than numWaitingFor Peers have seen the broadcast
private final CompletableFuture<Transaction> seenFuture = new ListenableCompletableFuture<>();
private final PeerGroup peerGroup; private final PeerGroup peerGroup;
private final Transaction tx; private final Transaction tx;
private int minConnections; private int minConnections;
@ -94,8 +95,11 @@ public class TransactionBroadcast {
}; };
} }
/**
* @return future that completes when some number of remote peers has rebroadcast the transaction
*/
public ListenableCompletableFuture<Transaction> future() { public ListenableCompletableFuture<Transaction> future() {
return ListenableCompletableFuture.of(future); return ListenableCompletableFuture.of(seenFuture);
} }
public void setMinConnections(int minConnections) { public void setMinConnections(int minConnections) {
@ -117,7 +121,7 @@ public class TransactionBroadcast {
long threshold = Math.round(numWaitingFor / 2.0); long threshold = Math.round(numWaitingFor / 2.0);
if (size > threshold) { if (size > threshold) {
log.warn("Threshold for considering broadcast rejected has been reached ({}/{})", size, threshold); log.warn("Threshold for considering broadcast rejected has been reached ({}/{})", size, threshold);
future.completeExceptionally(new RejectedTransactionException(tx, rejectMessage)); seenFuture.completeExceptionally(new RejectedTransactionException(tx, rejectMessage));
peerGroup.removePreMessageReceivedEventListener(this); peerGroup.removePreMessageReceivedEventListener(this);
} }
} }
@ -175,7 +179,7 @@ public class TransactionBroadcast {
} }
} }
}, Threading.SAME_THREAD); }, Threading.SAME_THREAD);
return ListenableCompletableFuture.of(future); return ListenableCompletableFuture.of(seenFuture);
} }
/** /**
@ -222,7 +226,7 @@ public class TransactionBroadcast {
log.info("broadcastTransaction: {} complete", tx.getTxId()); log.info("broadcastTransaction: {} complete", tx.getTxId());
peerGroup.removePreMessageReceivedEventListener(rejectionListener); peerGroup.removePreMessageReceivedEventListener(rejectionListener);
conf.removeEventListener(this); conf.removeEventListener(this);
future.complete(tx); // RE-ENTRANCY POINT seenFuture.complete(tx); // RE-ENTRANCY POINT
} }
} }
} }