Skip to content

Commit 4a614ff

Browse files
committed
test: explicit imports from test_framework.messages in p2p_invalid_messages.py
1 parent b35e1d2 commit 4a614ff

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

test/functional/p2p_invalid_messages.py

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,16 @@
77
import struct
88
import sys
99

10-
from test_framework import messages
10+
from test_framework.messages import (
11+
CBlockHeader,
12+
CInv,
13+
msg_getdata,
14+
msg_headers,
15+
msg_inv,
16+
msg_ping,
17+
MSG_TX,
18+
ser_string,
19+
)
1120
from test_framework.mininode import (
1221
NetworkThread,
1322
P2PDataStore,
@@ -25,7 +34,7 @@ def __init__(self, *, str_data):
2534
self.str_data = str_data.encode() if not isinstance(str_data, bytes) else str_data
2635

2736
def serialize(self):
28-
return messages.ser_string(self.str_data)
37+
return ser_string(self.str_data)
2938

3039
def __repr__(self):
3140
return "{}(data={})".format(self.msgtype, self.str_data)
@@ -135,7 +144,7 @@ def run_test(self):
135144
# For some reason unknown to me, we sometimes have to push additional data to the
136145
# peer in order for it to realize a disconnect.
137146
try:
138-
node.p2p.send_message(messages.msg_ping(nonce=123123))
147+
node.p2p.send_message(msg_ping(nonce=123123))
139148
except IOError:
140149
pass
141150

@@ -158,7 +167,7 @@ async def swap_magic_bytes():
158167
asyncio.run_coroutine_threadsafe(swap_magic_bytes(), NetworkThread.network_event_loop).result()
159168

160169
with self.nodes[0].assert_debug_log(['PROCESSMESSAGE: INVALID MESSAGESTART ping']):
161-
conn.send_message(messages.msg_ping(nonce=0xff))
170+
conn.send_message(msg_ping(nonce=0xff))
162171
conn.wait_for_disconnect(timeout=1)
163172
self.nodes[0].disconnect_p2ps()
164173

@@ -206,13 +215,13 @@ def test_msgtype(self):
206215
def test_large_inv(self):
207216
conn = self.nodes[0].add_p2p_connection(P2PInterface())
208217
with self.nodes[0].assert_debug_log(['Misbehaving', 'peer=4 (0 -> 20): message inv size() = 50001']):
209-
msg = messages.msg_inv([messages.CInv(messages.MSG_TX, 1)] * 50001)
218+
msg = msg_inv([CInv(MSG_TX, 1)] * 50001)
210219
conn.send_and_ping(msg)
211220
with self.nodes[0].assert_debug_log(['Misbehaving', 'peer=4 (20 -> 40): message getdata size() = 50001']):
212-
msg = messages.msg_getdata([messages.CInv(messages.MSG_TX, 1)] * 50001)
221+
msg = msg_getdata([CInv(MSG_TX, 1)] * 50001)
213222
conn.send_and_ping(msg)
214223
with self.nodes[0].assert_debug_log(['Misbehaving', 'peer=4 (40 -> 60): headers message size = 2001']):
215-
msg = messages.msg_headers([messages.CBlockHeader()] * 2001)
224+
msg = msg_headers([CBlockHeader()] * 2001)
216225
conn.send_and_ping(msg)
217226
self.nodes[0].disconnect_p2ps()
218227

0 commit comments

Comments
 (0)