mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-10-10 19:43:13 +02:00
scripted-diff: test: replace command with msgtype
This is the functional test framework pendant for
7777e3624f
, which renamed "strCommand" with
"msg_type" in the network processing code.
-BEGIN VERIFY SCRIPT-
# Rename in test framework
sed -i 's/command/msgtype/g' ./test/functional/test_framework/messages.py ./test/functional/test_framework/mininode.py
# Rename in individual tests
sed -i 's/command/msgtype/g' ./test/functional/p2p_invalid_messages.py ./test/functional/p2p_leak.py
-END VERIFY SCRIPT-
This commit is contained in:
@@ -19,7 +19,7 @@ from test_framework.test_framework import BitcoinTestFramework
|
||||
class msg_unrecognized:
|
||||
"""Nonsensical message. Modeled after similar types in test_framework.messages."""
|
||||
|
||||
command = b'badmsg'
|
||||
msgtype = b'badmsg'
|
||||
|
||||
def __init__(self, *, str_data):
|
||||
self.str_data = str_data.encode() if not isinstance(str_data, bytes) else str_data
|
||||
@@ -28,7 +28,7 @@ class msg_unrecognized:
|
||||
return messages.ser_string(self.str_data)
|
||||
|
||||
def __repr__(self):
|
||||
return "{}(data={})".format(self.command, self.str_data)
|
||||
return "{}(data={})".format(self.msgtype, self.str_data)
|
||||
|
||||
|
||||
class InvalidMessagesTest(BitcoinTestFramework):
|
||||
@@ -50,7 +50,7 @@ class InvalidMessagesTest(BitcoinTestFramework):
|
||||
self.test_magic_bytes()
|
||||
self.test_checksum()
|
||||
self.test_size()
|
||||
self.test_command()
|
||||
self.test_msgtype()
|
||||
self.test_large_inv()
|
||||
|
||||
node = self.nodes[0]
|
||||
@@ -168,7 +168,7 @@ class InvalidMessagesTest(BitcoinTestFramework):
|
||||
msg = conn.build_message(msg_unrecognized(str_data="d"))
|
||||
cut_len = (
|
||||
4 + # magic
|
||||
12 + # command
|
||||
12 + # msgtype
|
||||
4 #len
|
||||
)
|
||||
# modify checksum
|
||||
@@ -183,7 +183,7 @@ class InvalidMessagesTest(BitcoinTestFramework):
|
||||
msg = conn.build_message(msg_unrecognized(str_data="d"))
|
||||
cut_len = (
|
||||
4 + # magic
|
||||
12 # command
|
||||
12 # msgtype
|
||||
)
|
||||
# modify len to MAX_SIZE + 1
|
||||
msg = msg[:cut_len] + struct.pack("<I", 0x02000000 + 1) + msg[cut_len + 4:]
|
||||
@@ -191,13 +191,13 @@ class InvalidMessagesTest(BitcoinTestFramework):
|
||||
conn.wait_for_disconnect(timeout=1)
|
||||
self.nodes[0].disconnect_p2ps()
|
||||
|
||||
def test_command(self):
|
||||
def test_msgtype(self):
|
||||
conn = self.nodes[0].add_p2p_connection(P2PDataStore())
|
||||
with self.nodes[0].assert_debug_log(['PROCESSMESSAGE: ERRORS IN HEADER']):
|
||||
msg = msg_unrecognized(str_data="d")
|
||||
msg.command = b'\xff' * 12
|
||||
msg.msgtype = b'\xff' * 12
|
||||
msg = conn.build_message(msg)
|
||||
# Modify command
|
||||
# Modify msgtype
|
||||
msg = msg[:7] + b'\x00' + msg[7 + 1:]
|
||||
self.nodes[0].p2p.send_raw_message(msg)
|
||||
conn.sync_with_ping(timeout=1)
|
||||
|
Reference in New Issue
Block a user