File tree Expand file tree Collapse file tree 2 files changed +4
-4
lines changed
test/functional/test_framework Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change 33
33
34
34
MIN_VERSION_SUPPORTED = 60001
35
35
MY_VERSION = 70016 # past wtxid relay
36
- MY_SUBVERSION = b "/python-p2p-tester:0.0.3/"
36
+ MY_SUBVERSION = "/python-p2p-tester:0.0.3/"
37
37
MY_RELAY = 1 # from version 70001 onwards, fRelay should be appended to version messages (BIP37)
38
38
39
39
MAX_LOCATOR_SZ = 101
@@ -1048,7 +1048,7 @@ def deserialize(self, f):
1048
1048
self .addrFrom = CAddress ()
1049
1049
self .addrFrom .deserialize (f , with_time = False )
1050
1050
self .nNonce = struct .unpack ("<Q" , f .read (8 ))[0 ]
1051
- self .strSubVer = deser_string (f )
1051
+ self .strSubVer = deser_string (f ). decode ( 'utf-8' )
1052
1052
1053
1053
self .nStartingHeight = struct .unpack ("<i" , f .read (4 ))[0 ]
1054
1054
@@ -1069,7 +1069,7 @@ def serialize(self):
1069
1069
r += self .addrTo .serialize (with_time = False )
1070
1070
r += self .addrFrom .serialize (with_time = False )
1071
1071
r += struct .pack ("<Q" , self .nNonce )
1072
- r += ser_string (self .strSubVer )
1072
+ r += ser_string (self .strSubVer . encode ( 'utf-8' ) )
1073
1073
r += struct .pack ("<i" , self .nStartingHeight )
1074
1074
r += struct .pack ("<b" , self .nRelay )
1075
1075
return r
Original file line number Diff line number Diff line change @@ -572,7 +572,7 @@ def addconnection_callback(address, port):
572
572
573
573
def num_test_p2p_connections (self ):
574
574
"""Return number of test framework p2p connections to the node."""
575
- return len ([peer for peer in self .getpeerinfo () if peer ['subver' ] == MY_SUBVERSION . decode ( "utf-8" ) ])
575
+ return len ([peer for peer in self .getpeerinfo () if peer ['subver' ] == MY_SUBVERSION ])
576
576
577
577
def disconnect_p2ps (self ):
578
578
"""Close all p2p connections to the node."""
You can’t perform that action at this time.
0 commit comments