Merge #13566: Fix get balance
702ae1e21a
[RPC] [wallet] allow getbalance to use min_conf and watch_only without accounts. (John Newbery)cf15761f6d
[wallet] GetBalance can take a min_depth argument. (John Newbery)0f3d6e9ab7
[wallet] factor out GetAvailableWatchOnlyBalance() (John Newbery)7110c830f8
[wallet] deduplicate GetAvailableCredit logic (John Newbery)ef7bc8893c
[wallet] Factor out GetWatchOnlyBalance() (John Newbery)4279da4785
[wallet] GetBalance can take an isminefilter filter. (John Newbery) Pull request description: #12953 inadvertently removed the functionality to call `getbalance "*" <int> <bool>` to get the wallet's balance with either minconfs or include_watchonly. This restores that functionality (when `-deprecatedrpc=accounts`), and also makes it possible to call ``getbalance minconf=<int> include_watchonly=<bool>` when accounts are not being used. Tree-SHA512: 67e84de9291ed6d34b23c626f4dc5988ba0ae6c99708d02b87dd3aaad3f4b6baa6202a66cc2dadd30dd993a39de8036ee920fcaa8cbb1c5dfe606e6fac183344
This commit is contained in:
commit
ad552a54c5
5 changed files with 73 additions and 89 deletions
test/functional
|
@ -64,6 +64,15 @@ class WalletTest(BitcoinTestFramework):
|
|||
assert_equal(self.nodes[1].getbalance(), 50)
|
||||
assert_equal(self.nodes[2].getbalance(), 0)
|
||||
|
||||
# Check getbalance with different arguments
|
||||
assert_equal(self.nodes[0].getbalance("*"), 50)
|
||||
assert_equal(self.nodes[0].getbalance("*", 1), 50)
|
||||
assert_equal(self.nodes[0].getbalance("*", 1, True), 50)
|
||||
assert_equal(self.nodes[0].getbalance(minconf=1), 50)
|
||||
|
||||
# first argument of getbalance must be excluded or set to "*"
|
||||
assert_raises_rpc_error(-32, "dummy first argument must be excluded or set to \"*\"", self.nodes[0].getbalance, "")
|
||||
|
||||
# Check that only first and second nodes have UTXOs
|
||||
utxos = self.nodes[0].listunspent()
|
||||
assert_equal(len(utxos), 1)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue