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

6b56c1f4d0 test: remove last_{block,header}_equals() in p2p_fingerprint.py (Sebastian Falbesoner)
136d96b71f test: use wait_for_{block,header} helpers in p2p_fingerprint.py (Sebastian Falbesoner)

Pull request description:

  This small PR takes use of the message receiving helper functions `wait_for_block()` and `wait_for_header()` (from module `test_framework.p2p`) in the test `p2p_fingerprint.py`.  It also simplifies the checks for very old stale blocks/headers requests by getting rid of the functions `last_block_equals()` and `last_header_equals()` and rather only testing that not any blocks/headers message is received at all. Unneeded sending of requests are also removed and calls to time.sleep(...) substituted by ping syncs.

ACKs for top commit:
  guggero:
    ACK 6b56c1f4

Tree-SHA512: 9114db70f3804adad4ab658236762d4fa73fef91158c5756dd1af2d24196ea740451b0028667e0c4047f1f89fe1355031921d3dfb973acc1370052a4bc12c2ab

test/functional/p2p_fingerprint.py

@@ -18,6 +18,7 @@ from test_framework.p2p import (
     msg_block,
     msg_getdata,
     msg_getheaders,
+    p2p_lock,
 )
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
@@ -57,18 +58,6 @@ class P2PFingerprintTest(BitcoinTestFramework):
         msg.hashstop = block_hash
         node.send_message(msg)
 
-    # Check whether last block received from node has a given hash
-    def last_block_equals(self, expected_hash, node):
-        block_msg = node.last_message.get("block")
-        return block_msg and block_msg.block.rehash() == expected_hash
-
-    # Check whether last block header received from node has a given hash
-    def last_header_equals(self, expected_hash, node):
-        headers_msg = node.last_message.get("headers")
-        return (headers_msg and
-                headers_msg.headers and
-                headers_msg.headers[0].rehash() == expected_hash)
-
     # Checks that stale blocks timestamped more than a month ago are not served
     # by the node while recent stale blocks and old active chain blocks are.
     # This does not currently test that stale blocks timestamped within the
@@ -101,34 +90,31 @@ 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)
-        tip = self.nodes[0].generatetoaddress(1, self.nodes[0].get_deterministic_priv_key().address)[0]
+        self.nodes[0].generatetoaddress(1, self.nodes[0].get_deterministic_priv_key().address)
         assert_equal(self.nodes[0].getblockcount(), 14)
-
-        # Send getdata & getheaders to refresh last received getheader message
-        block_hash = int(tip, 16)
-        self.send_block_request(block_hash, node0)
-        self.send_header_request(block_hash, node0)
         node0.sync_with_ping()
 
         # Request for very old stale block should now fail
+        with p2p_lock:
+            node0.last_message.pop("block", None)
         self.send_block_request(stale_hash, node0)
-        time.sleep(3)
-        assert not self.last_block_equals(stale_hash, node0)
+        node0.sync_with_ping()
+        assert "block" not in node0.last_message
 
         # Request for very old stale block header should now fail
+        with p2p_lock:
+            node0.last_message.pop("headers", None)
         self.send_header_request(stale_hash, node0)
-        time.sleep(3)
-        assert not self.last_header_equals(stale_hash, node0)
+        node0.sync_with_ping()
+        assert "headers" not in node0.last_message
 
         # Verify we can fetch very old blocks and headers on the active chain
         block_hash = int(block_hashes[2], 16)
@@ -137,12 +123,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()