highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-26 00:41:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

test: store subversion (user agent) as string in msg_version

Browse Source
This commit is contained in:
Sebastian Falbesoner 2021-01-23 15:04:35 +01:00
parent 32b191fb66
commit de85af5cce
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/functional/test_framework/messages.py
View File

@ -33,7 +33,7 @@ from test_framework.util import hex_str_to_bytes, assert_equal
MIN_VERSION_SUPPORTED = 60001 MIN_VERSION_SUPPORTED = 60001
MY_VERSION = 70016 # past wtxid relay MY_VERSION = 70016 # past wtxid relay
MY_SUBVERSION = b"/python-p2p-tester:0.0.3/" MY_SUBVERSION = "/python-p2p-tester:0.0.3/"
MY_RELAY = 1 # from version 70001 onwards, fRelay should be appended to version messages (BIP37) MY_RELAY = 1 # from version 70001 onwards, fRelay should be appended to version messages (BIP37)
MAX_LOCATOR_SZ = 101 MAX_LOCATOR_SZ = 101
@ -1048,7 +1048,7 @@ class msg_version:
self.addrFrom = CAddress() self.addrFrom = CAddress()
self.addrFrom.deserialize(f, with_time=False) self.addrFrom.deserialize(f, with_time=False)
self.nNonce = struct.unpack("<Q", f.read(8))[0] self.nNonce = struct.unpack("<Q", f.read(8))[0]
self.strSubVer = deser_string(f) self.strSubVer = deser_string(f).decode('utf-8')
self.nStartingHeight = struct.unpack("<i", f.read(4))[0] self.nStartingHeight = struct.unpack("<i", f.read(4))[0]
@ -1069,7 +1069,7 @@ class msg_version:
r += self.addrTo.serialize(with_time=False) r += self.addrTo.serialize(with_time=False)
r += self.addrFrom.serialize(with_time=False) r += self.addrFrom.serialize(with_time=False)
r += struct.pack("<Q", self.nNonce) r += struct.pack("<Q", self.nNonce)
r += ser_string(self.strSubVer) r += ser_string(self.strSubVer.encode('utf-8'))
r += struct.pack("<i", self.nStartingHeight) r += struct.pack("<i", self.nStartingHeight)
r += struct.pack("<b", self.nRelay) r += struct.pack("<b", self.nRelay)
return r return r

2
test/functional/test_framework/test_node.py
View File

@ -572,7 +572,7 @@ class TestNode():
def num_test_p2p_connections(self): def num_test_p2p_connections(self):
"""Return number of test framework p2p connections to the node.""" """Return number of test framework p2p connections to the node."""
return len([peer for peer in self.getpeerinfo() if peer['subver'] == MY_SUBVERSION.decode("utf-8")]) return len([peer for peer in self.getpeerinfo() if peer['subver'] == MY_SUBVERSION])
def disconnect_p2ps(self): def disconnect_p2ps(self):
"""Close all p2p connections to the node.""" """Close all p2p connections to the node."""