From 1b5fdcaa77328aeba0806cda3cca1b2ffa427e7b Mon Sep 17 00:00:00 2001 From: Sean Gilligan Date: Mon, 27 Mar 2023 12:18:54 -0700 Subject: [PATCH] ForwardingService: use `awaitRelayed()` without extra `thenApply()` in `coinForwardingListener()` --- .../java/org/bitcoinj/examples/ForwardingService.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/src/main/java/org/bitcoinj/examples/ForwardingService.java b/examples/src/main/java/org/bitcoinj/examples/ForwardingService.java index 4d22763dd..4520f390d 100644 --- a/examples/src/main/java/org/bitcoinj/examples/ForwardingService.java +++ b/examples/src/main/java/org/bitcoinj/examples/ForwardingService.java @@ -24,7 +24,6 @@ import org.bitcoinj.base.AddressParser; import org.bitcoinj.core.Context; import org.bitcoinj.base.DefaultAddressParser; import org.bitcoinj.core.Transaction; -import org.bitcoinj.core.TransactionBroadcast; import org.bitcoinj.kits.WalletAppKit; import org.bitcoinj.utils.BriefLogFormatter; import org.bitcoinj.wallet.CoinSelection; @@ -169,10 +168,12 @@ public class ForwardingService implements Closeable { }) .thenCompose(broadcast -> { System.out.printf("Transaction %s is signed and is being delivered to %s...\n", broadcast.transaction().getTxId(), network); - return broadcast.awaitRelayed().thenApply(TransactionBroadcast::transaction); // Wait until peers report they have seen the transaction + return broadcast.awaitRelayed(); // Wait until peers report they have seen the transaction }) - .thenAccept(tx -> - System.out.printf("Sent %s onwards and acknowledged by peers, via transaction %s\n", tx.getOutputSum().toFriendlyString(), tx.getTxId()) + .thenAccept(broadcast -> + System.out.printf("Sent %s onwards and acknowledged by peers, via transaction %s\n", + broadcast.transaction().getOutputSum().toFriendlyString(), + broadcast.transaction().getTxId()) ); }