refactor: test: use wait_for_getdata() in p2p_compactblocks.py #18756

pull theStack wants to merge 1 commits into bitcoin:master from theStack:20200424-test-use-wait_for_getdata-in-p2p_compactblocks changing 1 files +2 −8

theStack commented at 12:19 PM on April 24, 2020: member

The method wait_for_getdata() was recently changed to be more precise by waiting for a specified list of hashes, instead of only matching any getdata message (see Issue #18614 and PR #18690). This PR replaces the remaining occurences of manual inspection of last_messages with this call.
refactor: test: use wait_for_getdata() in p2p_compactblocks.py c4027e7350
fanquake added the label Tests on Apr 24, 2020
robot-visions commented at 4:57 PM on April 24, 2020: contributor

ACK c4027e735072c3de4b4ffb20eecd7187ff36bad7

Ran p2p_unrequested_blocks.py locally, still passes. Thanks for cleaning this up!
MarcoFalke merged this on Apr 24, 2020
MarcoFalke closed this on Apr 24, 2020
sidhujag referenced this in commit 83fbffb5ee on Apr 24, 2020
fanquake deleted a comment on Apr 26, 2020

in test/functional/p2p_compactblocks.py:392 in c4027e7350

 392 | +            test_node.wait_for_getdata([block.sha256], timeout=30)
 393 |              assert_equal(test_node.last_message["getdata"].inv[0].type, 4)
 394 | -            assert_equal(test_node.last_message["getdata"].inv[0].hash, block.sha256)
 395 |  
 396 |              # Send back a compactblock message that omits the coinbase
 397 |              comp_block = HeaderAndShortIDs()

kingdavid6336 commented at 4:30 PM on April 27, 2020:

CMakeLists.txt

theStack deleted the branch on Dec 1, 2020
Fabcien referenced this in commit 9d4e2e9eed on Jan 20, 2021
DrahtBot locked this on Feb 15, 2022

Contributors

Labels

Linked (view graph)

#18614 test: Check hash in wait_for_get* helpers #18690 test: Check object hashes in wait_for_getdata