1 files changed, 2 insertions, 6 deletions
diff --git a/test/functional/p2p_message_capture.py b/test/functional/p2p_message_capture.py
index edde9a6ecf..87c77f4540 100755
--- a/test/functional/p2p_message_capture.py
+++ b/test/functional/p2p_message_capture.py
@@ -20,7 +20,7 @@ LENGTH_SIZE = 4
 MSGTYPE_SIZE = 12
 
 def mini_parser(dat_file):
-    """Parse a data file created by CaptureMessage.
+    """Parse a data file created by CaptureMessageToFile.
 
     From the data file we'll only check the structure.
 
@@ -43,12 +43,8 @@ def mini_parser(dat_file):
                 break
             tmp_header = BytesIO(tmp_header_raw)
             tmp_header.read(TIME_SIZE) # skip the timestamp field
-            raw_msgtype = tmp_header.read(MSGTYPE_SIZE)
-            msgtype: bytes = raw_msgtype.split(b'\x00', 1)[0]
-            remainder =  raw_msgtype.split(b'\x00', 1)[1]
-            assert(len(msgtype) > 0)
+            msgtype = tmp_header.read(MSGTYPE_SIZE).rstrip(b'\x00')
             assert(msgtype in MESSAGEMAP)
-            assert(len(remainder) == 0 or not remainder.decode().isprintable())
             length: int = int.from_bytes(tmp_header.read(LENGTH_SIZE), "little")
             data = f_in.read(length)
             assert_equal(len(data), length)