diff --git a/core/src/main/java/org/bitcoinj/core/Transaction.java b/core/src/main/java/org/bitcoinj/core/Transaction.java index 62435563..aa49053b 100644 --- a/core/src/main/java/org/bitcoinj/core/Transaction.java +++ b/core/src/main/java/org/bitcoinj/core/Transaction.java @@ -250,21 +250,6 @@ public class Transaction extends ChildMessage { return getHash().toString(); } - /** - * Calculates the sum of the outputs that are sending coins to a key in the wallet. The flag controls whether to - * include spent outputs or not. - */ - Coin getValueSentToMe(TransactionBag transactionBag, boolean includeSpent) { - // This is tested in WalletTest. - Coin v = Coin.ZERO; - for (TransactionOutput o : outputs) { - if (!o.isMineOrWatched(transactionBag)) continue; - if (!includeSpent && !o.isAvailableForSpending()) continue; - v = v.add(o.getValue()); - } - return v; - } - /** * Gets the sum of the inputs, regardless of who owns them. */ @@ -308,7 +293,13 @@ public class Transaction extends ChildMessage { * Calculates the sum of the outputs that are sending coins to a key in the wallet. */ public Coin getValueSentToMe(TransactionBag transactionBag) { - return getValueSentToMe(transactionBag, true); + // This is tested in WalletTest. + Coin v = Coin.ZERO; + for (TransactionOutput o : outputs) { + if (!o.isMineOrWatched(transactionBag)) continue; + v = v.add(o.getValue()); + } + return v; } /** diff --git a/core/src/main/java/org/bitcoinj/core/Wallet.java b/core/src/main/java/org/bitcoinj/core/Wallet.java index d539347a..f1b432b7 100644 --- a/core/src/main/java/org/bitcoinj/core/Wallet.java +++ b/core/src/main/java/org/bitcoinj/core/Wallet.java @@ -2101,7 +2101,7 @@ public class Wallet extends BaseTaggableObject // Now make sure it ends up in the right pool. Also, handle the case where this TX is double-spending // against our pending transactions. Note that a tx may double spend our pending transactions and also send // us money/spend our money. - boolean hasOutputsToMe = tx.getValueSentToMe(this, true).signum() > 0; + boolean hasOutputsToMe = tx.getValueSentToMe(this).signum() > 0; if (hasOutputsToMe) { // Needs to go into either unspent or spent (if the outputs were already spent by a pending tx). if (tx.isEveryOwnedOutputSpent(this)) { diff --git a/core/src/test/java/org/bitcoinj/core/WalletTest.java b/core/src/test/java/org/bitcoinj/core/WalletTest.java index 1bc6ddcd..9e56f1df 100644 --- a/core/src/test/java/org/bitcoinj/core/WalletTest.java +++ b/core/src/test/java/org/bitcoinj/core/WalletTest.java @@ -627,7 +627,7 @@ public class WalletTest extends TestWithWallet { public void balances() throws Exception { Coin nanos = COIN; Transaction tx1 = sendMoneyToWallet(nanos, AbstractBlockChain.NewBlockType.BEST_CHAIN); - assertEquals(nanos, tx1.getValueSentToMe(wallet, true)); + assertEquals(nanos, tx1.getValueSentToMe(wallet)); assertTrue(tx1.getWalletOutputs(wallet).size() >= 1); // Send 0.10 to somebody else. Transaction send1 = wallet.createSend(new ECKey().toAddress(params), valueOf(0, 10));