diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-11-10 12:45:39 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-11-10 12:45:44 +0100 |
| commit | 5150accdd2a7c7f0edf964d56bd7d34b5f740cdc (patch) | |
| tree | 3f85d39b7547cdfef45bf0da99fc0629b1ec81e2 /test/functional/wallet_listtransactions.py | |
| parent | 1e49fe450dbb0c258776526dba3ee583461d42ff (diff) | |
| parent | 89306ab0df93bfdf5630910bc20b1eccb7379172 (diff) | |
| download | bitcoin-5150accdd2a7c7f0edf964d56bd7d34b5f740cdc.tar.xz | |
Merge #14441: [wallet] Backport(0.17): Restore ability to list incoming transactions by label
89306ab0df93bfdf5630910bc20b1eccb7379172 [wallet] Restore ability to list incoming transactions by label (Russell Yanofsky)
Pull request description:
Backport of PR #14411 to v0.17.
This change partially reverts #13075 and #14023.
Fixes #14382
Tree-SHA512: 1f8300e1a79e826cd706561265b8788deef505fa510be1a76ed9a62e5fca37cf6a741423ac0e5de2a36d6e8b9f25f141885455aacacbbf6474814e6eae406a27
Diffstat (limited to 'test/functional/wallet_listtransactions.py')
| -rwxr-xr-x | test/functional/wallet_listtransactions.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/functional/wallet_listtransactions.py b/test/functional/wallet_listtransactions.py index 5a17395abd..00a6b9c393 100755 --- a/test/functional/wallet_listtransactions.py +++ b/test/functional/wallet_listtransactions.py @@ -97,9 +97,10 @@ 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(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}) + assert len(self.nodes[0].listtransactions(label="watchonly", count=100, skip=0, include_watchonly=False)) == 0 + assert_array_result(self.nodes[0].listtransactions(label="watchonly", count=100, skip=0, include_watchonly=True), + {"category": "receive", "amount": Decimal("0.1")}, + {"txid": txid, "label": "watchonly"}) self.run_rbf_opt_in_test() |