update test framework tx (de)serialization

nav-io · Mar 25, 2023 · 6980f93 · 6980f93
1 parent 14dbc73
commit 6980f93
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py
@@ -115,6 +115,12 @@ def deser_string(f):
 def ser_string(s):
     return ser_compact_size(len(s)) + s
 
+def deser_bytes(f, count):
+    return f.read(count)
+
+def ser_bytes(s):
+    return s
+
 def deser_uint256(f):
     r = 0
     for i in range(8):
@@ -448,11 +454,11 @@ def __init__(self, point=b"\xc0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
         self.p = point
 
     def deserialize(self, f):
-        self.p = deser_string(f)
+        self.p = deser_bytes(f, 48)
 
     def serialize(self):
         r = b""
-        r += ser_string(self.p)
+        r += ser_bytes(self.p)
         return r
 
 class MclScalar:
@@ -462,11 +468,11 @@ def __init__(self, scalar=b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
         self.s = scalar
 
     def deserialize(self, f):
-        self.s = deser_string(f)
+        self.s = deser_bytes(f, 32)
 
     def serialize(self):
         r = b""
-        r += ser_string(self.s)
+        r += ser_bytes(self.s)
         return r
 
 class BLSCTSignature:
@@ -476,11 +482,11 @@ def __init__(self, signature=b"\xc0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
        self.sig = signature
 
     def deserialize(self, f):
-        self.sig = deser_string(f)
+        self.sig = deser_bytes(f, 96)
 
     def serialize(self):
         r = b""
-        r += ser_string(self.sig)
+        r += ser_bytes(self.sig)
         return r
 
 class RangeProof:
@@ -714,9 +720,9 @@ def is_null(self):
 
 class CTransaction:
     __slots__ = ("hash", "nLockTime", "nVersion", "sha256", "vin", "vout",
-                 "wit", "txSig", "balanceSig")
+                 "wit", "txSig")
 
-    def __init__(self, tx=None, txSig = BLSCTSignature(), balanceSig = BLSCTSignature()):
+    def __init__(self, tx=None, txSig = BLSCTSignature()):
         if tx is None:
             self.nVersion = 2
             self.vin = []
@@ -734,7 +740,6 @@ def __init__(self, tx=None, txSig = BLSCTSignature(), balanceSig = BLSCTSignatur
             self.hash = tx.hash
             self.wit = copy.deepcopy(tx.wit)
         self.txSig = txSig
-        self.balanceSig = balanceSig
 
     def deserialize(self, f):
         self.nVersion = struct.unpack("<i", f.read(4))[0]
@@ -756,7 +761,6 @@ def deserialize(self, f):
             self.wit = CTxWitness()
         self.nLockTime = struct.unpack("<I", f.read(4))[0]
         if self.nVersion & TX_VERSION_BLSCT_MARKER:
-            self.balanceSig.deserialize(f)
             self.txSig.deserialize(f)
         self.sha256 = None
         self.hash = None
@@ -768,7 +772,6 @@ def serialize_without_witness(self):
         r += ser_vector(self.vout)
         r += struct.pack("<I", self.nLockTime)
         if self.nVersion & TX_VERSION_BLSCT_MARKER:
-            r += self.balanceSig.serialize()
             r += self.txSig.serialize()
         return r
 
@@ -794,7 +797,6 @@ def serialize_with_witness(self):
             r += self.wit.serialize()
         r += struct.pack("<I", self.nLockTime)
         if self.nVersion & TX_VERSION_BLSCT_MARKER:
-            r += self.balanceSig.serialize()
             r += self.txSig.serialize()
         return r