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

Wallet: replace Interables.concat() with Stream.concat() in getWatchedOutputs()

Browse source 
This simplifies the code and removes a Guava dependency.
This commit is contained in:
Sean Gilligan 2023-09-15 17:36:06 -07:00 • committed by Andreas Schildbach
parent 68e61d9507
commit 5955eee4c8
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/src/main/java/org/bitcoinj/wallet/Wallet.java
View file

@ -19,7 +19,6 @@ package org.bitcoinj.wallet;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Iterables;
import com.google.common.math.IntMath; import com.google.common.math.IntMath;
import com.google.protobuf.ByteString; import com.google.protobuf.ByteString;
import net.jcip.annotations.GuardedBy; import net.jcip.annotations.GuardedBy;
@ -132,7 +131,6 @@ import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.Random; import java.util.Random;
import java.util.Set; import java.util.Set;
import java.util.Spliterator;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
@ -142,7 +140,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; 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.checkArgument;
import static org.bitcoinj.base.internal.Preconditions.checkState; import static org.bitcoinj.base.internal.Preconditions.checkState;
@ -3502,8 +3499,7 @@ public class Wallet extends BaseTaggableObject
lock.lock(); lock.lock();
keyChainGroupLock.lock(); keyChainGroupLock.lock();
try { try {
Spliterator<Transaction> spliterator = Iterables.concat(unspent.values(), pending.values()).spliterator(); return Stream.concat(unspent.values().stream(), pending.values().stream())
return StreamSupport.stream(spliterator, false)
.filter(tx -> !excludeImmatureCoinbases || isTransactionMature(tx)) .filter(tx -> !excludeImmatureCoinbases || isTransactionMature(tx))
.flatMap(tx -> tx.getOutputs().stream()) .flatMap(tx -> tx.getOutputs().stream())
.filter(TransactionOutput::isAvailableForSpending) .filter(TransactionOutput::isAvailableForSpending)