Skip to content

Commit

Permalink
test: explicit imports from test_framework.messages in p2p_invalid_me…
Browse files Browse the repository at this point in the history
…ssages.py

Summary:
This is a backport of Core [[bitcoin/bitcoin#18764 | PR18764]] [3/3]
bitcoin/bitcoin@4a614ff

Depends on D9142

Test Plan: test/functional/test_runner.py p2p_invalid_messages

Reviewers: #bitcoin_abc, Fabien

Reviewed By: #bitcoin_abc, Fabien

Differential Revision: https://reviews.bitcoinabc.org/D9143
  • Loading branch information
theStack authored and PiRK committed Feb 3, 2021
1 parent 6791b7f commit 3bf72f5
Showing 1 changed file with 16 additions and 8 deletions.
24 changes: 16 additions & 8 deletions test/functional/p2p_invalid_messages.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,16 @@
import asyncio
import struct

from test_framework import messages
from test_framework.messages import (
CBlockHeader,
CInv,
msg_getdata,
msg_headers,
msg_inv,
msg_ping,
MSG_TX,
ser_string,
)
from test_framework.mininode import (
NetworkThread,
P2PDataStore,
Expand All @@ -24,7 +33,7 @@ def __init__(self, *, str_data):
self.str_data = str_data.encode() if not isinstance(str_data, bytes) else str_data

def serialize(self):
return messages.ser_string(self.str_data)
return ser_string(self.str_data)

def __repr__(self):
return "{}(data={})".format(self.msgtype, self.str_data)
Expand Down Expand Up @@ -136,7 +145,7 @@ def run_test(self):
# For some reason unknown to me, we sometimes have to push additional data to the
# peer in order for it to realize a disconnect.
try:
node.p2p.send_message(messages.msg_ping(nonce=123123))
node.p2p.send_message(msg_ping(nonce=123123))
except IOError:
pass

Expand All @@ -163,7 +172,7 @@ async def swap_magic_bytes():
NetworkThread.network_event_loop).result()

with self.nodes[0].assert_debug_log(['PROCESSMESSAGE: INVALID MESSAGESTART ping']):
conn.send_message(messages.msg_ping(nonce=0xff))
conn.send_message(msg_ping(nonce=0xff))
conn.wait_for_disconnect(timeout=1)
self.nodes[0].disconnect_p2ps()

Expand Down Expand Up @@ -217,14 +226,13 @@ def test_msgtype(self):
def test_large_inv(self):
conn = self.nodes[0].add_p2p_connection(P2PInterface())
with self.nodes[0].assert_debug_log(['Misbehaving', 'peer=4 (0 -> 20): oversized-inv: message inv size() = 50001']):
msg = messages.msg_inv([messages.CInv(messages.MSG_TX, 1)] * 50001)
msg = msg_inv([CInv(MSG_TX, 1)] * 50001)
conn.send_and_ping(msg)
with self.nodes[0].assert_debug_log(['Misbehaving', 'peer=4 (20 -> 40): too-many-inv: message getdata size() = 50001']):
msg = messages.msg_getdata(
[messages.CInv(messages.MSG_TX, 1)] * 50001)
msg = msg_getdata([CInv(MSG_TX, 1)] * 50001)
conn.send_and_ping(msg)
with self.nodes[0].assert_debug_log(['Misbehaving', 'peer=4 (40 -> 60): too-many-headers: headers message size = 2001']):
msg = messages.msg_headers([messages.CBlockHeader()] * 2001)
msg = msg_headers([CBlockHeader()] * 2001)
conn.send_and_ping(msg)
self.nodes[0].disconnect_p2ps()

Expand Down

0 comments on commit 3bf72f5

Please sign in to comment.