Skip to content

Commit 490ae0e

Browse files
author
MarcoFalke
committed
Merge #18520: test: remaining replacements of (send_message+sync_with_ping) with send_and_ping
3dc8c01 test: remaining replacements of (send_message+sync_with_ping) with send_and_ping (Sebastian Falbesoner) Pull request description: This is a tiny follow-up PR to #18494, substituting the remaining occurences of `send_message(...)`/`sync_with_ping(...)` pairs with `send_and_ping(...)`, as suggested in the comment bitcoin/bitcoin#18494 (review). Thanks to jonatack and [MarcoFalke](bitcoin/bitcoin#18494 (comment)) for giving me the hint to do this follow-up. ACKs for top commit: practicalswift: ACK 3dc8c01 Tree-SHA512: 44d64332933c23a7f59c0415e008ce1b2b2e07177f81cb9473b7c71558188f1c698e8973de5cc940280e4697f9553af852d9a42841304f82469673d1c8162852
2 parents a3b61cf + 3dc8c01 commit 490ae0e

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

test/functional/p2p_segwit.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,7 @@ def test_transaction_acceptance(node, p2p, tx, with_witness, accepted, reason=No
125125
- use the getrawmempool rpc to check for acceptance."""
126126
reason = [reason] if reason else []
127127
with node.assert_debug_log(expected_msgs=reason):
128-
p2p.send_message(msg_tx(tx) if with_witness else msg_no_witness_tx(tx))
129-
p2p.sync_with_ping()
128+
p2p.send_and_ping(msg_tx(tx) if with_witness else msg_no_witness_tx(tx))
130129
assert_equal(tx.hash in node.getrawmempool(), accepted)
131130

132131

@@ -137,8 +136,7 @@ def test_witness_block(node, p2p, block, accepted, with_witness=True, reason=Non
137136
- use the getbestblockhash rpc to check for acceptance."""
138137
reason = [reason] if reason else []
139138
with node.assert_debug_log(expected_msgs=reason):
140-
p2p.send_message(msg_block(block) if with_witness else msg_no_witness_block(block))
141-
p2p.sync_with_ping()
139+
p2p.send_and_ping(msg_block(block) if with_witness else msg_no_witness_block(block))
142140
assert_equal(node.getbestblockhash() == block.hash, accepted)
143141

144142

0 commit comments

Comments
 (0)