aboutsummaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorAlex Morcos <morcos@chaincode.com>2016-03-17 12:48:05 -0400
committerWladimir J. van der Laan <laanwj@gmail.com>2016-03-23 15:11:22 +0100
commit19866c1ffcb860bc2980e00e956685b9a8f96529 (patch)
tree25b380a9564e729acbbc48904a6300cb0d7c5f71 /qa
parentf04f4fd2eed581a5e287d14036d790cf2badcbe6 (diff)
downloadbitcoin-19866c1ffcb860bc2980e00e956685b9a8f96529.tar.xz
Fix calculation of balances and available coins.
No longer consider coins which aren't in our mempool. Add test for regression in abandonconflict.py Github-Pull: #7715 Rebased-From: 68d4282774d6a60c609301cddad0b652f16df4d9
Diffstat (limited to 'qa')
-rwxr-xr-xqa/rpc-tests/abandonconflict.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/qa/rpc-tests/abandonconflict.py b/qa/rpc-tests/abandonconflict.py
index 38028df079..a83aa97fcd 100755
--- a/qa/rpc-tests/abandonconflict.py
+++ b/qa/rpc-tests/abandonconflict.py
@@ -83,6 +83,12 @@ class AbandonConflictTest(BitcoinTestFramework):
# inputs are still spent, but change not received
newbalance = self.nodes[0].getbalance()
assert(newbalance == balance - Decimal("24.9996"))
+ # Unconfirmed received funds that are not in mempool, also shouldn't show
+ # up in unconfirmed balance
+ unconfbalance = self.nodes[0].getunconfirmedbalance() + self.nodes[0].getbalance()
+ assert(unconfbalance == newbalance)
+ # Also shouldn't show up in listunspent
+ assert(not txABC2 in [utxo["txid"] for utxo in self.nodes[0].listunspent(0)])
balance = newbalance
# Abandon original transaction and verify inputs are available again