test: use wait_for_{block,header} helpers in p2p_fingerprint.py

This commit is contained in:
Sebastian Falbesoner 2020-09-30 16:48:04 +02:00
parent 72affcb16c
commit 136d96b71f

View file

@ -101,13 +101,11 @@ class P2PFingerprintTest(BitcoinTestFramework):
# Check that getdata request for stale block succeeds
self.send_block_request(stale_hash, node0)
test_function = lambda: self.last_block_equals(stale_hash, node0)
self.wait_until(test_function, timeout=3)
node0.wait_for_block(stale_hash, timeout=3)
# Check that getheader request for stale block header succeeds
self.send_header_request(stale_hash, node0)
test_function = lambda: self.last_header_equals(stale_hash, node0)
self.wait_until(test_function, timeout=3)
node0.wait_for_header(hex(stale_hash), timeout=3)
# Longest chain is extended so stale is much older than chain tip
self.nodes[0].setmocktime(0)
@ -137,12 +135,10 @@ class P2PFingerprintTest(BitcoinTestFramework):
node0.sync_with_ping()
self.send_block_request(block_hash, node0)
test_function = lambda: self.last_block_equals(block_hash, node0)
self.wait_until(test_function, timeout=3)
node0.wait_for_block(block_hash, timeout=3)
self.send_header_request(block_hash, node0)
test_function = lambda: self.last_header_equals(block_hash, node0)
self.wait_until(test_function, timeout=3)
node0.wait_for_header(hex(block_hash), timeout=3)
if __name__ == '__main__':
P2PFingerprintTest().main()