highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 06:28:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

[test] Ignore BIP324 decoy messages

Browse Source 
Also allow P2PConnection::send_message() to send decoy messages for
writing tests.
This commit is contained in:
stratospher
2022-12-10 20:12:51 +05:30
parent 8c054aa04d
commit 4115cf9956
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/functional/test_framework/p2p.py
View File

@@ -315,6 +315,8 @@ class P2PConnection(asyncio.Protocol):
return return
self.recvbuf = self.recvbuf[msglen:] self.recvbuf = self.recvbuf[msglen:]
if msg is None: # ignore decoy messages
return
assert msg # application layer messages (which aren't decoy messages) are non-empty assert msg # application layer messages (which aren't decoy messages) are non-empty
shortid = msg[0] # 1-byte short message type ID shortid = msg[0] # 1-byte short message type ID
if shortid == 0: if shortid == 0:
@@ -364,13 +366,13 @@ class P2PConnection(asyncio.Protocol):
# Socket write methods # Socket write methods
def send_message(self, message): def send_message(self, message, is_decoy=False):
"""Send a P2P message over the socket. """Send a P2P message over the socket.
This method takes a P2P payload, builds the P2P header and adds This method takes a P2P payload, builds the P2P header and adds
the message to the send buffer to be sent over the socket.""" the message to the send buffer to be sent over the socket."""
with self._send_lock: with self._send_lock:
tmsg = self.build_message(message) tmsg = self.build_message(message, is_decoy)
self._log_message("send", message) self._log_message("send", message)
return self.send_raw_message(tmsg) return self.send_raw_message(tmsg)
@@ -388,7 +390,7 @@ class P2PConnection(asyncio.Protocol):
# Class utility methods # Class utility methods
def build_message(self, message): def build_message(self, message, is_decoy=False):
"""Build a serialized P2P message""" """Build a serialized P2P message"""
msgtype = message.msgtype msgtype = message.msgtype
data = message.serialize() data = message.serialize()
@@ -400,7 +402,7 @@ class P2PConnection(asyncio.Protocol):
tmsg += msgtype tmsg += msgtype
tmsg += b"\x00" * (12 - len(msgtype)) tmsg += b"\x00" * (12 - len(msgtype))
tmsg += data tmsg += data
return self.v2_state.v2_enc_packet(tmsg) return self.v2_state.v2_enc_packet(tmsg, ignore=is_decoy)
else: else:
tmsg = self.magic_bytes tmsg = self.magic_bytes
tmsg += msgtype tmsg += msgtype
@@ -825,7 +827,7 @@ class P2PDataStore(P2PInterface):
if response is not None: if response is not None:
self.send_message(response) self.send_message(response)
def send_blocks_and_test(self, blocks, node, *, success=True, force_send=False, reject_reason=None, expect_disconnect=False, timeout=60): def send_blocks_and_test(self, blocks, node, *, success=True, force_send=False, reject_reason=None, expect_disconnect=False, timeout=60, is_decoy=False):
"""Send blocks to test node and test whether the tip advances. """Send blocks to test node and test whether the tip advances.
- add all blocks to our block_store - add all blocks to our block_store
@@ -844,9 +846,11 @@ class P2PDataStore(P2PInterface):
reject_reason = [reject_reason] if reject_reason else [] reject_reason = [reject_reason] if reject_reason else []
with node.assert_debug_log(expected_msgs=reject_reason): with node.assert_debug_log(expected_msgs=reject_reason):
if is_decoy: # since decoy messages are ignored by the recipient - no need to wait for response
force_send = True
if force_send: if force_send:
for b in blocks: for b in blocks:
self.send_message(msg_block(block=b)) self.send_message(msg_block(block=b), is_decoy)
else: else:
self.send_message(msg_headers([CBlockHeader(block) for block in blocks])) self.send_message(msg_headers([CBlockHeader(block) for block in blocks]))
self.wait_until( self.wait_until(