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

merge bitcoin#29352: fix intermittent failure in p2p_v2_earlykeyresponse

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2024-01-30 17:53:52 -05:00
parent 6b2a8b5988
commit e2788189fd
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/functional/p2p_v2_earlykeyresponse.py
View File

@ -50,6 +50,7 @@ class PeerEarlyKey(P2PInterface):
def __init__(self): def __init__(self):
super().__init__() super().__init__()
self.v2_state = None self.v2_state = None
self.connection_opened = False
def connection_made(self, transport): def connection_made(self, transport):
"""64 bytes ellswift is sent in 2 parts during `initial_v2_handshake()`""" """64 bytes ellswift is sent in 2 parts during `initial_v2_handshake()`"""
@ -60,6 +61,8 @@ class PeerEarlyKey(P2PInterface):
# check that data can be received on recvbuf only when mismatch from V1_PREFIX happens (send_net_magic = False) # check that data can be received on recvbuf only when mismatch from V1_PREFIX happens (send_net_magic = False)
assert self.v2_state.can_data_be_received and not self.v2_state.send_net_magic assert self.v2_state.can_data_be_received and not self.v2_state.send_net_magic
def on_open(self):
self.connection_opened = True
class P2PEarlyKey(BitcoinTestFramework): class P2PEarlyKey(BitcoinTestFramework):
def set_test_params(self): def set_test_params(self):
@ -75,6 +78,7 @@ class P2PEarlyKey(BitcoinTestFramework):
self.log.info('If a response is received, assertion failure would happen in our custom data_received() function') self.log.info('If a response is received, assertion failure would happen in our custom data_received() function')
# send happens in `initiate_v2_handshake()` in `connection_made()` # send happens in `initiate_v2_handshake()` in `connection_made()`
peer1 = node0.add_p2p_connection(PeerEarlyKey(), wait_for_verack=False, send_version=False, supports_v2_p2p=True) peer1 = node0.add_p2p_connection(PeerEarlyKey(), wait_for_verack=False, send_version=False, supports_v2_p2p=True)
self.wait_until(lambda: peer1.connection_opened)
self.log.info('Sending remaining ellswift and garbage which are different from V1_PREFIX. Since a response is') self.log.info('Sending remaining ellswift and garbage which are different from V1_PREFIX. Since a response is')
self.log.info('expected now, our custom data_received() function wouldn\'t result in assertion failure') self.log.info('expected now, our custom data_received() function wouldn\'t result in assertion failure')
ellswift_and_garbage_data = peer1.v2_state.initiate_v2_handshake() ellswift_and_garbage_data = peer1.v2_state.initiate_v2_handshake()