From 91c4e080ad9867d374bb6571e0084760349efc1e Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 16 Jan 2016 15:59:15 +0100 Subject: [PATCH] Wallet: Make getPoolSize() visible for testing. --- core/src/main/java/org/bitcoinj/core/Wallet.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/org/bitcoinj/core/Wallet.java b/core/src/main/java/org/bitcoinj/core/Wallet.java index 93f2f6cfa..6de95f5ff 100644 --- a/core/src/main/java/org/bitcoinj/core/Wallet.java +++ b/core/src/main/java/org/bitcoinj/core/Wallet.java @@ -2702,9 +2702,7 @@ public class Wallet extends BaseTaggableObject try { checkArgument(numTransactions >= 0); // Firstly, put all transactions into an array. - int size = getPoolSize(Pool.UNSPENT) + - getPoolSize(Pool.SPENT) + - getPoolSize(Pool.PENDING); + int size = unspent.size() + spent.size() + pending.size(); if (numTransactions > size || numTransactions == 0) { numTransactions = size; } @@ -2900,7 +2898,8 @@ public class Wallet extends BaseTaggableObject } } - int getPoolSize(WalletTransaction.Pool pool) { + @VisibleForTesting + public int getPoolSize(WalletTransaction.Pool pool) { lock.lock(); try { switch (pool) {