mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-01-18 13:22:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Wallet: refactor getWatchedOutputs() to use streams

Browse Source 
1. Get a spliterator from the concatenated iterator
2. Use streams instead of nested loops
3. Extract `isWatchedScriptPubKey()` helper function
This commit is contained in:
Sean Gilligan 2023-09-15 17:30:35 -07:00 committed by Andreas Schildbach
parent bce4475aaf
commit 68e61d9507
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
core/src/main/java/org/bitcoinj/wallet/Wallet.java
View File

@ -132,6 +132,7 @@ import java.util.Objects;
import java.util.Optional;
import java.util.Random;
import java.util.Set;
import java.util.Spliterator;
import java.util.TreeSet;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CopyOnWriteArrayList;
@ -141,6 +142,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
import static org.bitcoinj.base.internal.Preconditions.checkArgument;
import static org.bitcoinj.base.internal.Preconditions.checkState;
@ -3500,27 +3502,28 @@ public class Wallet extends BaseTaggableObject
lock.lock();
keyChainGroupLock.lock();
try {
List<TransactionOutput> candidates = new LinkedList<>();
for (Transaction tx : Iterables.concat(unspent.values(), pending.values())) {
if (excludeImmatureCoinbases && !isTransactionMature(tx)) continue;
for (TransactionOutput output : tx.getOutputs()) {
if (!output.isAvailableForSpending()) continue;
try {
Script scriptPubKey = output.getScriptPubKey();
if (!watchedScripts.contains(scriptPubKey)) continue;
candidates.add(output);
} catch (ScriptException e) {
// Ignore
}
}
}
return candidates;
Spliterator<Transaction> spliterator = Iterables.concat(unspent.values(), pending.values()).spliterator();
return StreamSupport.stream(spliterator, false)
.filter(tx -> !excludeImmatureCoinbases || isTransactionMature(tx))
.flatMap(tx -> tx.getOutputs().stream())
.filter(TransactionOutput::isAvailableForSpending)
.filter(this::isWatchedScriptPubKey)
.collect(StreamUtils.toUnmodifiableList());
} finally {
keyChainGroupLock.unlock();
lock.unlock();
}
}
private boolean isWatchedScriptPubKey(TransactionOutput output) {
try {
Script scriptPubKey = output.getScriptPubKey();
return watchedScripts.contains(scriptPubKey);
} catch (ScriptException e) {
return false;
}
}
/**
* Clean up the wallet. Currently, it only removes risky pending transaction from the wallet and only if their
* outputs have not been spent.