From 71ee048d1e8e17692161bbd447fcbcf1efc5c2c9 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Fri, 28 Feb 2014 13:47:40 +0100 Subject: [PATCH] Print available balance in Wallet.toString(), rather than the redundant number of Satoshis. --- core/src/main/java/com/google/bitcoin/core/Wallet.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/google/bitcoin/core/Wallet.java b/core/src/main/java/com/google/bitcoin/core/Wallet.java index 4761111d..4ce84e04 100644 --- a/core/src/main/java/com/google/bitcoin/core/Wallet.java +++ b/core/src/main/java/com/google/bitcoin/core/Wallet.java @@ -2326,9 +2326,10 @@ public class Wallet implements Serializable, BlockChainListener, PeerFilterProvi lock.lock(); try { StringBuilder builder = new StringBuilder(); - BigInteger balance = getBalance(BalanceType.ESTIMATED); - builder.append(String.format("Wallet containing %s BTC (%d satoshis) in:%n", - bitcoinValueToPlainString(balance), balance.longValue())); + BigInteger estimatedBalance = getBalance(BalanceType.ESTIMATED); + BigInteger availableBalance = getBalance(BalanceType.AVAILABLE); + builder.append(String.format("Wallet containing %s BTC (available: %s BTC) in:%n", + bitcoinValueToPlainString(estimatedBalance), bitcoinValueToPlainString(availableBalance))); builder.append(String.format(" %d pending transactions%n", pending.size())); builder.append(String.format(" %d unspent transactions%n", unspent.size())); builder.append(String.format(" %d spent transactions%n", spent.size()));