diff --git a/test/functional/p2p_quorum_data.py b/test/functional/p2p_quorum_data.py index d14ce4874d..7257007f8a 100755 --- a/test/functional/p2p_quorum_data.py +++ b/test/functional/p2p_quorum_data.py @@ -78,7 +78,7 @@ def get_p2p_id(node, uacomment=None): for p2p in node.p2ps: if uacomment is not None and p2p.uacomment != uacomment: continue - if p["subver"] == p2p.strSubVer.decode(): + if p["subver"] == p2p.strSubVer: return p["id"] return None wait_until_helper(lambda: get_id() is not None, timeout=10) diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py index 17164eb55a..d4a8eca3c2 100755 --- a/test/functional/test_framework/messages.py +++ b/test/functional/test_framework/messages.py @@ -33,7 +33,7 @@ import dash_hash MIN_VERSION_SUPPORTED = 60001 MY_VERSION = 70231 # NO_LEGACY_ISLOCK_PROTO_VERSION -MY_SUBVERSION = b"/python-p2p-tester:0.0.3%s/" +MY_SUBVERSION = "/python-p2p-tester:0.0.3%s/" MY_RELAY = 1 # from version 70001 onwards, fRelay should be appended to version messages (BIP37) MAX_LOCATOR_SZ = 101 @@ -1521,7 +1521,7 @@ class msg_version: self.addrTo = CAddress() self.addrFrom = CAddress() self.nNonce = random.getrandbits(64) - self.strSubVer = MY_SUBVERSION % b"" + self.strSubVer = MY_SUBVERSION % "" self.nStartingHeight = -1 self.nRelay = MY_RELAY @@ -1535,7 +1535,7 @@ class msg_version: self.addrFrom = CAddress() self.addrFrom.deserialize(f, with_time=False) self.nNonce = struct.unpack("