From dd26a7a806da1d77f91d0d32bd8e94b10bd218c1 Mon Sep 17 00:00:00 2001 From: fanquake Date: Thu, 26 Aug 2021 08:34:49 +0800 Subject: [PATCH] Merge bitcoin/bitcoin#22797: test, doc: refer to the correct variable names in p2p_invalid_tx.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 0d9fdd329e81cb171d687042290f4e6b1507d7f4 test, doc: refer to the correct variable names in p2p_invalid_tx.py (aitorjs) Pull request description: _tx_orphan_no_fee_ and _tx_orphan_invalid_ don't exist as transactions. Have been replaced by _tx_orphan_2_no_fee_ and _tx_orphan_2_invalid_ respectively. **Motivation**: Comments are more accurate and easy understandable under the tests context (I think). ACKs for top commit: kristapsk: utACK 0d9fdd329e81cb171d687042290f4e6b1507d7f4 theStack: ACK 0d9fdd329e81cb171d687042290f4e6b1507d7f4 📃 Tree-SHA512: a4cafd931e51fe2a67085e10e9c61178c864c14982664d112b76327e040af08cd1de04eca4a8ae980fad57ba7078017ce02fc60e7658f38380e8172c2ae28b77 --- test/functional/p2p_invalid_tx.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/functional/p2p_invalid_tx.py b/test/functional/p2p_invalid_tx.py index 4f63c59c3d..c0fd000630 100755 --- a/test/functional/p2p_invalid_tx.py +++ b/test/functional/p2p_invalid_tx.py @@ -174,9 +174,9 @@ class InvalidTxRequestTest(BitcoinTestFramework): tx_orphan_2_valid, # The valid transaction (with sufficient fee) ] } - # Transactions that do not end up in the mempool - # tx_orphan_no_fee, because it has too low fee (p2ps[0] is not disconnected for relaying that tx) - # tx_orphan_invaid, because it has negative fee (p2ps[1] is disconnected for relaying that tx) + # Transactions that do not end up in the mempool: + # tx_orphan_2_no_fee, because it has too low fee (p2ps[0] is not disconnected for relaying that tx) + # tx_orphan_2_invalid, because it has negative fee (p2ps[1] is disconnected for relaying that tx) if resolve_via_block: # This TX has appeared in a block instead of being broadcasted via the mempool expected_mempool.remove(tx_withhold.hash)