sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#29893: test: fix intermittent failure in p2p_compactblocks_hb.py

Browse Source 
1ae5b208d339fa984d9caf4fab89b0b2ba9cc197 test: fix intermittent failure in p2p_compactblocks_hb.py (Martin Zumsande)

Pull request description:

  Fixes #29860

  As a result of node1 receiving a block, it sends out SENDCMPCT messages to some of its peers to update the high-bandwidth status. We need to wait until those are received and processed by the peers to avoid intermittent failures. Before, we'd only wait until all peers have synced with the new block (within `generate`) which is not sufficient.

  I could reproduce the failure by adding a `std::this_thread::sleep_for(std::chrono::milliseconds(1000));` sleep to the [net_processing code](c7567d9223/src/net_processing.cpp (L3763)) that processes `NetMsgType::SENDCMPCT`.

ACKs for top commit:
  instagibbs:
    ACK 1ae5b208d339fa984d9caf4fab89b0b2ba9cc197
  alfonsoromanz:
    Tested ACK 1ae5b208d339fa984d9caf4fab89b0b2ba9cc197
  glozow:
    ACK 1ae5b208d339fa984d9caf4fab89b0b2ba9cc197

Tree-SHA512: 47c29616e73a5e0ff966fc231e4f672c1a6892511e5c10a3905b30ad6b2a3d1267fa0a88bd8f64b523fe580199d22a43545c84e361879e5096483152065c4b9a
This commit is contained in:
glozow 2024-04-17 11:24:24 +01:00 committed by pasta
parent 4ecb76104e
commit bb4102c590
No known key found for this signature in database
GPG Key ID: E2F3D7916E722D38
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/functional/p2p_compactblocks_hb.py
View File

@ -33,10 +33,15 @@ class CompactBlocksConnectionTest(BitcoinTestFramework):
self.generate(self.nodes[0], 1) self.generate(self.nodes[0], 1)
self.sync_blocks() self.sync_blocks()
self.disconnect_nodes(peer, 0) self.disconnect_nodes(peer, 0)
status_to = [self.peer_info(1, i)['bip152_hb_to'] for i in range(2, 6)]
status_from = [self.peer_info(i, 1)['bip152_hb_from'] for i in range(2, 6)] def status_to():
assert_equal(status_to, status_from) return [self.peer_info(1, i)['bip152_hb_to'] for i in range(2, 6)]
return status_to
def status_from():
return [self.peer_info(i, 1)['bip152_hb_from'] for i in range(2, 6)]
self.wait_until(lambda: status_to() == status_from())
return status_to()
def run_test(self): def run_test(self):
self.log.info("Testing reserved high-bandwidth mode slot for outbound peer...") self.log.info("Testing reserved high-bandwidth mode slot for outbound peer...")