Merge bitcoin#18866: test: Fix verack race to avoid intermittent test failures

fae153b test: Fix verack race to avoid intermittent test failures (MarcoFalke)

Pull request description:

  Fixes bitcoin#18832

ACKs for top commit:
  laanwj:
    ACK fae153b

Tree-SHA512: 071de8c8e2b2787c9433c7460e18b9a54beaf471a52ce848c5ac7263fc2a40f5b976d4f558ecc494fd0fa07284b7c98d29267cade58f80ab74fe9a7d18d94298

Author: MarcoFalke

test/functional/test_framework/util.py

@@ -382,7 +382,11 @@ def connect_nodes(from_connection, node_num):
     from_connection.addnode(ip_port, "onetry")
     # poll until version handshake complete to avoid race conditions
     # with transaction relaying
-    wait_until(lambda:  all(peer['version'] != 0 for peer in from_connection.getpeerinfo()))
+    # See comments in net_processing:
+    # * Must have a version message before anything else
+    # * Must have a verack message before anything else
+    wait_until(lambda: all(peer['version'] != 0 for peer in from_connection.getpeerinfo()))
+    wait_until(lambda: all(peer['bytesrecv_per_msg'].pop('verack', 0) == 24 for peer in from_connection.getpeerinfo()))
 
 def connect_nodes_clique(nodes):
     # max_workers should be the maximum number of nodes that we have in the same functional test,