test: explicit imports from test_framework.messages in p2p_invalid_messages.py

1 files changed, 16 insertions, 7 deletions

diff --git a/test/functional/p2p_invalid_messages.py b/test/functional/p2p_invalid_messages.py
index e4e269e871..81302374c9 100755
--- a/test/functional/p2p_invalid_messages.py
+++ b/test/functional/p2p_invalid_messages.py
@@ -7,7 +7,16 @@ import asyncio
 import struct
 import sys
 
-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,
@@ -25,7 +34,7 @@ class msg_unrecognized:
         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)
@@ -135,7 +144,7 @@ class InvalidMessagesTest(BitcoinTestFramework):
             # 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
 
@@ -158,7 +167,7 @@ class InvalidMessagesTest(BitcoinTestFramework):
         asyncio.run_coroutine_threadsafe(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()
 
@@ -206,13 +215,13 @@ class InvalidMessagesTest(BitcoinTestFramework):
     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): 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): 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): 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()