From 64dbce8455a9ee7dba7556fdf5621bfb7b2b174f Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Tue, 8 Feb 2022 23:08:00 +0000 Subject: [PATCH] QA: wallet_basic: Split wtx expected_fields over multiple lines to minimise merge conflicts --- test/functional/wallet_basic.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/test/functional/wallet_basic.py b/test/functional/wallet_basic.py index 01149a0977..9ed6926917 100755 --- a/test/functional/wallet_basic.py +++ b/test/functional/wallet_basic.py @@ -680,8 +680,21 @@ class WalletTest(BitcoinTestFramework): "amount": baz["amount"], "category": baz["category"], "vout": baz["vout"]} - expected_fields = frozenset({'amount', 'bip125-replaceable', 'confirmations', 'details', 'fee', - 'hex', 'lastprocessedblock', 'time', 'timereceived', 'trusted', 'txid', 'wtxid', 'walletconflicts'}) + expected_fields = frozenset({ + 'amount', + 'bip125-replaceable', + 'confirmations', + 'details', + 'fee', + 'hex', + 'lastprocessedblock', + 'time', + 'timereceived', + 'trusted', + 'txid', + 'wtxid', + 'walletconflicts', + }) verbose_field = "decoded" expected_verbose_fields = expected_fields | {verbose_field}