diff --git a/shared/serializations.py b/shared/serializations.py index d0b7d2f9..411fb06c 100755 --- a/shared/serializations.py +++ b/shared/serializations.py @@ -59,13 +59,13 @@ def deser_compact_size(f): nit = struct.unpack(" 253 + assert nit >= 253 elif nit == 254: nit = struct.unpack(" 0x1_0000 + assert nit >= 0x1_0000 elif nit == 255: nit = struct.unpack(" 0x1_0000_0000 + assert nit >= 0x1_0000_0000 return nit def deser_string(f): diff --git a/testing/devtest/unit_script.py b/testing/devtest/unit_script.py index 0d3bf60e..ac712bab 100644 --- a/testing/devtest/unit_script.py +++ b/testing/devtest/unit_script.py @@ -33,7 +33,6 @@ V = range(1, 16) for i, v1 in enumerate(V): for j in range(i+1, len(V)): M, N = v1, V[j] - print(M, N) # number of pubkeys times 1 pushdata + 33 pubkey = 34 * N # +1 M # +1 N @@ -43,18 +42,11 @@ for i, v1 in enumerate(V): assert vec == deser_string_vector(BytesIO(ser_string_vector(vec))) -for i in [253, 0x10000, 0x100000000, 0x10000000000000000]: +for i in [253, 0x10000, 0x100000000]: for j in [-1, 0, 1]: num = i + j - if i == 0x10000000000000000 and (j != -1): - try: - ser_compact_size(num) - raise RuntimeError - except AssertionError: - continue - else: - x = ser_compact_size(num) + x = ser_compact_size(num) assert num == deser_compact_size(BytesIO(x)) -# EOF \ No newline at end of file +# EOF