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)
Nice! Concept ACK.
Concept ACK. I think combining some commits (especially the flake8 fixes) would help in review.
I've squashed all the flake8 fixes into a single commit as requested by @jonasschnelli , and opened a PR for just those fixes at #13136.
wallet_importprunedfunds.py change to a separate PR (since it exposes a bitcoind OOM error)Should be a fairly straightforward review.
tests fail on travis
Thanks @MarcoFalke . Should now be fixed.
Concept ACK
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']]
What does keypoolmin do?
Looks like this was added in d34957e17e8c9740104533aaf4a896e93548c87e and it is fine to just remove.
removed
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']
nit: Could use named args for those True and False?
You can't mix positional and named args, so I've named them all.
utACK 6b7a4ea7e9929d0ad65c7caf822f44ab6c01a475. Some style nits/questions.
Concept ACK
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.
→ git diff 6b7a4ea7e9929d0ad65c7caf822f44ab6c01a475 5d536619abda745c298fd827a856df775f223241
diff --git a/test/functional/wallet_keypool_topup.py b/test/functional/wallet_keypool_topup.py
index 30a0c9a76..d657dc30c 100755
--- a/test/functional/wallet_keypool_topup.py
+++ b/test/functional/wallet_keypool_topup.py
@@ -25,7 +25,7 @@ class KeypoolRestoreTest(BitcoinTestFramework):
def set_test_params(self):
self.setup_clean_chain = True
self.num_nodes = 2
- self.extra_args = [[], ['-keypool=100', '-keypoolmin=20']]
+ self.extra_args = [[], ['-keypool=100']]
def run_test(self):
wallet_path = os.path.join(self.nodes[1].datadir, "regtest", "wallets", "wallet.dat")
diff --git a/test/functional/wallet_listtransactions.py b/test/functional/wallet_listtransactions.py
index 3de65b9b5..7cf2e456c 100755
--- a/test/functional/wallet_listtransactions.py
+++ b/test/functional/wallet_listtransactions.py
@@ -94,8 +94,8 @@ class ListTransactionsTest(BitcoinTestFramework):
txid = self.nodes[1].sendtoaddress(multisig["address"], 0.1)
self.nodes[1].generate(1)
self.sync_all()
- assert not [tx for tx in self.nodes[0].listtransactions("*", 100, 0, False) if "label" in tx and tx["label"] == "watchonly"]
- txs = [tx for tx in self.nodes[0].listtransactions("*", 100, 0, True) if "label" in tx and tx['label'] == 'watchonly']
+ 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"]
+ 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']
assert_array_result(txs, {"category": "receive", "amount": Decimal("0.1")}, {"txid": txid})
self.run_rbf_opt_in_test()