From 5955eee4c832f6082ae42212a5d9d7e20ef4c260 Mon Sep 17 00:00:00 2001 From: Sean Gilligan Date: Fri, 15 Sep 2023 17:36:06 -0700 Subject: [PATCH] Wallet: replace `Interables.concat()` with `Stream.concat()` in `getWatchedOutputs()` This simplifies the code and removes a Guava dependency. --- core/src/main/java/org/bitcoinj/wallet/Wallet.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/core/src/main/java/org/bitcoinj/wallet/Wallet.java b/core/src/main/java/org/bitcoinj/wallet/Wallet.java index 6e18fea76..6ca156f5b 100644 --- a/core/src/main/java/org/bitcoinj/wallet/Wallet.java +++ b/core/src/main/java/org/bitcoinj/wallet/Wallet.java @@ -19,7 +19,6 @@ package org.bitcoinj.wallet; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.Iterables; import com.google.common.math.IntMath; import com.google.protobuf.ByteString; import net.jcip.annotations.GuardedBy; @@ -132,7 +131,6 @@ 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; @@ -142,7 +140,6 @@ 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; @@ -3502,8 +3499,7 @@ public class Wallet extends BaseTaggableObject lock.lock(); keyChainGroupLock.lock(); try { - Spliterator spliterator = Iterables.concat(unspent.values(), pending.values()).spliterator(); - return StreamSupport.stream(spliterator, false) + return Stream.concat(unspent.values().stream(), pending.values().stream()) .filter(tx -> !excludeImmatureCoinbases || isTransactionMature(tx)) .flatMap(tx -> tx.getOutputs().stream()) .filter(TransactionOutput::isAvailableForSpending)