Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-29 13:32:33 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

test: improve msg sends and p2p disconnections in p2p_invalid_messages

Browse Source 
- call disconnect_p2ps() outside of the assert_debug_log scopes
- send messages directly from the p2p conn rather than via nodes[0].p2p
- add an assertion
This commit is contained in:
Jon Atack 2020-06-14 13:08:27 +02:00
parent 57960192a5
commit 75447f0893
No known key found for this signature in database
GPG Key ID: 4F5721B3D0E3921D
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/functional/p2p_invalid_messages.py
View File

@ -86,7 +86,7 @@ class InvalidMessagesTest(BitcoinTestFramework):
msg = b'\xff' * 4 + msg[4:] msg = b'\xff' * 4 + msg[4:]
conn.send_raw_message(msg) conn.send_raw_message(msg)
conn.wait_for_disconnect(timeout=1) conn.wait_for_disconnect(timeout=1)
self.nodes[0].disconnect_p2ps() self.nodes[0].disconnect_p2ps()
def test_checksum(self): def test_checksum(self):
self.log.info("Test message with invalid checksum logs an error") self.log.info("Test message with invalid checksum logs an error")
@ -97,9 +97,9 @@ class InvalidMessagesTest(BitcoinTestFramework):
cut_len = 4 + 12 + 4 cut_len = 4 + 12 + 4
# modify checksum # modify checksum
msg = msg[:cut_len] + b'\xff' * 4 + msg[cut_len + 4:] msg = msg[:cut_len] + b'\xff' * 4 + msg[cut_len + 4:]
self.nodes[0].p2p.send_raw_message(msg) conn.send_raw_message(msg)
conn.sync_with_ping(timeout=1) conn.sync_with_ping(timeout=1)
self.nodes[0].disconnect_p2ps() self.nodes[0].disconnect_p2ps()
def test_size(self): def test_size(self):
self.log.info("Test message with oversized payload disconnects peer") self.log.info("Test message with oversized payload disconnects peer")
@ -107,9 +107,9 @@ class InvalidMessagesTest(BitcoinTestFramework):
with self.nodes[0].assert_debug_log(['']): with self.nodes[0].assert_debug_log(['']):
msg = msg_unrecognized(str_data="d" * (VALID_DATA_LIMIT + 1)) msg = msg_unrecognized(str_data="d" * (VALID_DATA_LIMIT + 1))
msg = conn.build_message(msg) msg = conn.build_message(msg)
self.nodes[0].p2p.send_raw_message(msg) conn.send_raw_message(msg)
conn.wait_for_disconnect(timeout=1) conn.wait_for_disconnect(timeout=1)
self.nodes[0].disconnect_p2ps() self.nodes[0].disconnect_p2ps()
def test_msgtype(self): def test_msgtype(self):
self.log.info("Test message with invalid message type logs an error") self.log.info("Test message with invalid message type logs an error")
@ -120,9 +120,9 @@ class InvalidMessagesTest(BitcoinTestFramework):
msg = conn.build_message(msg) msg = conn.build_message(msg)
# Modify msgtype # Modify msgtype
msg = msg[:7] + b'\x00' + msg[7 + 1:] msg = msg[:7] + b'\x00' + msg[7 + 1:]
self.nodes[0].p2p.send_raw_message(msg) conn.send_raw_message(msg)
conn.sync_with_ping(timeout=1) conn.sync_with_ping(timeout=1)
self.nodes[0].disconnect_p2ps() self.nodes[0].disconnect_p2ps()
def test_oversized_msg(self, msg, size): def test_oversized_msg(self, msg, size):
msg_type = msg.msgtype.decode('ascii') msg_type = msg.msgtype.decode('ascii')
@ -160,8 +160,9 @@ class InvalidMessagesTest(BitcoinTestFramework):
self.log.info("(c) Wait for node to drop junk messages, while remaining connected") self.log.info("(c) Wait for node to drop junk messages, while remaining connected")
conn.sync_with_ping(timeout=400) conn.sync_with_ping(timeout=400)
# Peer 1, despite being served up a bunch of nonsense, should still be connected. # Despite being served up a bunch of nonsense, the peers should still be connected.
assert conn.is_connected assert conn.is_connected
assert conn2.is_connected
self.nodes[0].disconnect_p2ps() self.nodes[0].disconnect_p2ps()