From e186ef9c84a4c878280eeed260d7f3560aa9c6d1 Mon Sep 17 00:00:00 2001 From: Sean Gilligan Date: Wed, 6 Sep 2023 10:55:12 -0700 Subject: [PATCH] WalletTool: simplify coinSelector lambdas --- .../main/java/org/bitcoinj/wallettool/WalletTool.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/wallettool/src/main/java/org/bitcoinj/wallettool/WalletTool.java b/wallettool/src/main/java/org/bitcoinj/wallettool/WalletTool.java index 9bca82939..a5f27f5e9 100644 --- a/wallettool/src/main/java/org/bitcoinj/wallettool/WalletTool.java +++ b/wallettool/src/main/java/org/bitcoinj/wallettool/WalletTool.java @@ -445,8 +445,7 @@ public class WalletTool implements Callable { final Address validSelectAddr = selectAddr; coinSelector = CoinSelector.fromPredicate(candidate -> { try { - Address candidateAddr = candidate.getScriptPubKey().getToAddress(net); - return validSelectAddr.equals(candidateAddr); + return candidate.getScriptPubKey().getToAddress(net).equals(validSelectAddr); } catch (ScriptException x) { return false; } @@ -456,11 +455,9 @@ public class WalletTool implements Callable { String[] parts = selectOutputStr.split(":", 2); Sha256Hash selectTransactionHash = Sha256Hash.wrap(parts[0]); int selectIndex = Integer.parseInt(parts[1]); - coinSelector = CoinSelector.fromPredicate(candidate -> { - int candidateIndex = candidate.getIndex(); - Sha256Hash candidateTransactionHash = candidate.getParentTransactionHash(); - return selectIndex == candidateIndex && selectTransactionHash.equals(candidateTransactionHash); - }); + coinSelector = CoinSelector.fromPredicate(candidate -> + candidate.getIndex() == selectIndex && candidate.getParentTransactionHash().equals(selectTransactionHash) + ); } send(coinSelector, outputsStr, feePerVkb, lockTimeStr, allowUnconfirmed); } else if (paymentRequestLocationStr != null) {