mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-12-02 16:59:44 +01:00
test: store subversion (user agent) as string in msg_version
This commit is contained in:
@@ -33,7 +33,7 @@ from test_framework.util import hex_str_to_bytes, assert_equal
|
||||
|
||||
MIN_VERSION_SUPPORTED = 60001
|
||||
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)
|
||||
|
||||
MAX_LOCATOR_SZ = 101
|
||||
@@ -1048,7 +1048,7 @@ class msg_version:
|
||||
self.addrFrom = CAddress()
|
||||
self.addrFrom.deserialize(f, with_time=False)
|
||||
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]
|
||||
|
||||
@@ -1069,7 +1069,7 @@ class msg_version:
|
||||
r += self.addrTo.serialize(with_time=False)
|
||||
r += self.addrFrom.serialize(with_time=False)
|
||||
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("<b", self.nRelay)
|
||||
return r
|
||||
|
||||
Reference in New Issue
Block a user