diff options
| author | Andrew Chow <github@achow101.com> | 2023-05-02 11:42:50 -0400 |
|---|---|---|
| committer | Andrew Chow <github@achow101.com> | 2023-05-02 11:50:45 -0400 |
| commit | da9f62f912294de07a595df0b4898aba4be6b69c (patch) | |
| tree | 2081d107a2613bc01bafe4dec178d9188ecc9a5e /test/functional/wallet_basic.py | |
| parent | 7b45d171f549595a831489827c28e8493f36c00c (diff) | |
| parent | 710b83938ab5bbc4bd324d8b2e69461a2a1d2eec (diff) | |
Merge bitcoin/bitcoin#26094: rpc: Return block hash & height in getbalances, gettransaction and getwalletinfo
710b83938ab5bbc4bd324d8b2e69461a2a1d2eec rpc: return block hash & height in getbalances, gettransaction & getwalletinfo JSONs (Harris)
Pull request description:
Reopens #18570 and closes #18567.
I have rebased the original PR.
Not sure why the original got closed as it was about to get merged.
ACKs for top commit:
achow101:
ACK 710b83938ab5bbc4bd324d8b2e69461a2a1d2eec
Tree-SHA512: d4478d990be98b1642e9ffb2930987f4a224e8bd64e2e35a5dda927a54c509ec9d712cd0eac35dc2bb89f00a1678e530ce14d7445f1dd93aa3a4cce2bc9b130d
Diffstat (limited to 'test/functional/wallet_basic.py')
| -rwxr-xr-x | test/functional/wallet_basic.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/wallet_basic.py b/test/functional/wallet_basic.py index 1f771dabe4..e23ec7bc01 100755 --- a/test/functional/wallet_basic.py +++ b/test/functional/wallet_basic.py @@ -680,7 +680,7 @@ class WalletTest(BitcoinTestFramework): "category": baz["category"], "vout": baz["vout"]} expected_fields = frozenset({'amount', 'bip125-replaceable', 'confirmations', 'details', 'fee', - 'hex', 'time', 'timereceived', 'trusted', 'txid', 'wtxid', 'walletconflicts'}) + 'hex', 'lastprocessedblock', 'time', 'timereceived', 'trusted', 'txid', 'wtxid', 'walletconflicts'}) verbose_field = "decoded" expected_verbose_fields = expected_fields | {verbose_field} |