Next step in #12952. Removes all usage of the ‘account’ API from the wallet functional tests, except:
-deprecatedrpc=accounts command line argument is working properly).wallet_labels.py (which tests that both the ’label’ and ‘account’ APIs work in V0.17).‘account’ API usage for both of those tests can be removed once V0.17 has been branched.
Also excluded is:
wallet_importprunedfunds.py (which fails due to a bitcoind OOM error)
wallet_importprunedfunds.py change to a separate PR (since it exposes a bitcoind OOM error)Should be a fairly straightforward review.
24@@ -25,7 +25,7 @@ class KeypoolRestoreTest(BitcoinTestFramework):
25 def set_test_params(self):
26 self.setup_clean_chain = True
27 self.num_nodes = 2
28- self.extra_args = [['-deprecatedrpc=accounts'], ['-deprecatedrpc=accounts', '-keypool=100', '-keypoolmin=20']]
29+ self.extra_args = [[], ['-keypool=100', '-keypoolmin=20']]
100- assert(len(self.nodes[0].listtransactions("watchonly", 100, 0, False)) == 0)
101- assert_array_result(self.nodes[0].listtransactions("watchonly", 100, 0, True),
102- {"category": "receive", "amount": Decimal("0.1")},
103- {"txid": txid, "account": "watchonly"})
104+ assert not [tx for tx in self.nodes[0].listtransactions("*", 100, 0, False) if "label" in tx and tx["label"] == "watchonly"]
105+ txs = [tx for tx in self.nodes[0].listtransactions("*", 100, 0, True) if "label" in tx and tx['label'] == 'watchonly']
True and False?
Removes usage of account API from the following functional tests:
- wallet_listreceivedby.py
- wallet_basic.py
- wallet_keypool_topup.py
- wallet_txn_clone.py
- wallet_listsinceblock.py
- wallet_import_rescan.py
- wallet_listtransactions.py
- wallet_txn_doublespend.py
Thanks for the reviews. I’ve addressed @MarcoFalke ’s comments.
0→ git diff 6b7a4ea7e9929d0ad65c7caf822f44ab6c01a475 5d536619abda745c298fd827a856df775f223241
1diff --git a/test/functional/wallet_keypool_topup.py b/test/functional/wallet_keypool_topup.py
2index 30a0c9a76..d657dc30c 100755
3--- a/test/functional/wallet_keypool_topup.py
4+++ b/test/functional/wallet_keypool_topup.py
5@@ -25,7 +25,7 @@ class KeypoolRestoreTest(BitcoinTestFramework):
6 def set_test_params(self):
7 self.setup_clean_chain = True
8 self.num_nodes = 2
9- self.extra_args = [[], ['-keypool=100', '-keypoolmin=20']]
10+ self.extra_args = [[], ['-keypool=100']]
11
12 def run_test(self):
13 wallet_path = os.path.join(self.nodes[1].datadir, "regtest", "wallets", "wallet.dat")
14diff --git a/test/functional/wallet_listtransactions.py b/test/functional/wallet_listtransactions.py
15index 3de65b9b5..7cf2e456c 100755
16--- a/test/functional/wallet_listtransactions.py
17+++ b/test/functional/wallet_listtransactions.py
18@@ -94,8 +94,8 @@ class ListTransactionsTest(BitcoinTestFramework):
19 txid = self.nodes[1].sendtoaddress(multisig["address"], 0.1)
20 self.nodes[1].generate(1)
21 self.sync_all()
22- assert not [tx for tx in self.nodes[0].listtransactions("*", 100, 0, False) if "label" in tx and tx["label"] == "watchonly"]
23- txs = [tx for tx in self.nodes[0].listtransactions("*", 100, 0, True) if "label" in tx and tx['label'] == 'watchonly']
24+ assert not [tx for tx in self.nodes[0].listtransactions(dummy="*", count=100, skip=0, include_watchonly=False) if "label" in tx and tx["label"] == "watchonly"]
25+ txs = [tx for tx in self.nodes[0].listtransactions(dummy="*", count=100, skip=0, include_watchonly=True) if "label" in tx and tx['label'] == 'watchonly']
26 assert_array_result(txs, {"category": "receive", "amount": Decimal("0.1")}, {"txid": txid})
27
28 self.run_rbf_opt_in_test()