zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[qa] mininode: Unfiddle strings into bytes

This commit is contained in:
MarcoFalke 2016-04-23 14:35:52 +02:00
parent f604bf6321
commit 5555528b47
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qa/rpc-tests/test_framework/mininode.py
View File

@ -93,7 +93,7 @@ def deser_uint256(f):
def ser_uint256(u): def ser_uint256(u):
rs = "" rs = b""
for i in xrange(8): for i in xrange(8):
rs += struct.pack("<I", u & 0xFFFFFFFFL) rs += struct.pack("<I", u & 0xFFFFFFFFL)
u >>= 32 u >>= 32
@ -191,7 +191,7 @@ def deser_string_vector(f):
def ser_string_vector(l): def ser_string_vector(l):
r = "" r = b""
if len(l) < 253: if len(l) < 253:
r = struct.pack("B", len(l)) r = struct.pack("B", len(l))
elif len(l) < 0x10000: elif len(l) < 0x10000:
@ -624,7 +624,7 @@ class CAlert(object):
self.vchSig = deser_string(f) self.vchSig = deser_string(f)
def serialize(self): def serialize(self):
r = "" r = b""
r += ser_string(self.vchMsg) r += ser_string(self.vchMsg)
r += ser_string(self.vchSig) r += ser_string(self.vchSig)
return r return r
@ -988,7 +988,7 @@ class msg_reject(object):
def __init__(self): def __init__(self):
self.message = b"" self.message = b""
self.code = 0 self.code = 0
self.reason = "" self.reason = b""
self.data = 0L self.data = 0L
def deserialize(self, f): def deserialize(self, f):