mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-07-13 03:36:59 +02:00
test: Remove struct import from messages.py
This commit is contained in:
@ -25,7 +25,6 @@ from io import BytesIO
|
|||||||
import math
|
import math
|
||||||
import random
|
import random
|
||||||
import socket
|
import socket
|
||||||
import struct
|
|
||||||
import time
|
import time
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
@ -92,11 +91,11 @@ def ser_compact_size(l):
|
|||||||
if l < 253:
|
if l < 253:
|
||||||
r = l.to_bytes(1, "little")
|
r = l.to_bytes(1, "little")
|
||||||
elif l < 0x10000:
|
elif l < 0x10000:
|
||||||
r = struct.pack("<BH", 253, l)
|
r = (253).to_bytes(1, "little") + l.to_bytes(2, "little")
|
||||||
elif l < 0x100000000:
|
elif l < 0x100000000:
|
||||||
r = struct.pack("<BI", 254, l)
|
r = (254).to_bytes(1, "little") + l.to_bytes(4, "little")
|
||||||
else:
|
else:
|
||||||
r = struct.pack("<BQ", 255, l)
|
r = (255).to_bytes(1, "little") + l.to_bytes(8, "little")
|
||||||
return r
|
return r
|
||||||
|
|
||||||
|
|
||||||
@ -1635,12 +1634,12 @@ class msg_sendcmpct:
|
|||||||
self.version = version
|
self.version = version
|
||||||
|
|
||||||
def deserialize(self, f):
|
def deserialize(self, f):
|
||||||
self.announce = struct.unpack("<?", f.read(1))[0]
|
self.announce = bool(int.from_bytes(f.read(1), "little"))
|
||||||
self.version = int.from_bytes(f.read(8), "little")
|
self.version = int.from_bytes(f.read(8), "little")
|
||||||
|
|
||||||
def serialize(self):
|
def serialize(self):
|
||||||
r = b""
|
r = b""
|
||||||
r += struct.pack("<?", self.announce)
|
r += int(self.announce).to_bytes(1, "little")
|
||||||
r += self.version.to_bytes(8, "little")
|
r += self.version.to_bytes(8, "little")
|
||||||
return r
|
return r
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user