AaronFiore/electrum
1
0
Fork 0
Code Activity

fix field type: 'varint' was rebńamed to 'bigsize'

Browse Source
This commit is contained in:
ThomasV
2023-01-13 15:45:20 +01:00
parent c109d5e722
commit 020637b5d4
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
electrum/lnmsg.py
View File

@@ -129,7 +129,7 @@ def _read_field(*, fd: io.BytesIO, field_type: str, count: Union[int, str]) -> U
if len(raw) > 0 and raw[0] == 0x00: if len(raw) > 0 and raw[0] == 0x00:
raise FieldEncodingNotMinimal() raise FieldEncodingNotMinimal()
return int.from_bytes(raw, byteorder="big", signed=False) return int.from_bytes(raw, byteorder="big", signed=False)
elif field_type == 'varint': elif field_type == 'bigsize':
assert count == 1, count assert count == 1, count
val = read_bigsize_int(fd) val = read_bigsize_int(fd)
if val is None: if val is None:
@@ -203,7 +203,7 @@ def _write_field(*, fd: io.BytesIO, field_type: str, count: Union[int, str],
if nbytes_written != len(value): if nbytes_written != len(value):
raise Exception(f"tried to write {len(value)} bytes, but only wrote {nbytes_written}!?") raise Exception(f"tried to write {len(value)} bytes, but only wrote {nbytes_written}!?")
return return
elif field_type == 'varint': elif field_type == 'bigsize':
assert count == 1, count assert count == 1, count
if isinstance(value, int): if isinstance(value, int):
value = write_bigsize_int(value) value = write_bigsize_int(value)
@@ -243,8 +243,8 @@ def _write_field(*, fd: io.BytesIO, field_type: str, count: Union[int, str],
def _read_tlv_record(*, fd: io.BytesIO) -> Tuple[int, bytes]: def _read_tlv_record(*, fd: io.BytesIO) -> Tuple[int, bytes]:
if not fd: raise Exception() if not fd: raise Exception()
tlv_type = _read_field(fd=fd, field_type="varint", count=1) tlv_type = _read_field(fd=fd, field_type="bigsize", count=1)
tlv_len = _read_field(fd=fd, field_type="varint", count=1) tlv_len = _read_field(fd=fd, field_type="bigsize", count=1)
tlv_val = _read_field(fd=fd, field_type="byte", count=tlv_len) tlv_val = _read_field(fd=fd, field_type="byte", count=tlv_len)
return tlv_type, tlv_val return tlv_type, tlv_val
@@ -252,8 +252,8 @@ def _read_tlv_record(*, fd: io.BytesIO) -> Tuple[int, bytes]:
def _write_tlv_record(*, fd: io.BytesIO, tlv_type: int, tlv_val: bytes) -> None: def _write_tlv_record(*, fd: io.BytesIO, tlv_type: int, tlv_val: bytes) -> None:
if not fd: raise Exception() if not fd: raise Exception()
tlv_len = len(tlv_val) tlv_len = len(tlv_val)
_write_field(fd=fd, field_type="varint", count=1, value=tlv_type) _write_field(fd=fd, field_type="bigsize", count=1, value=tlv_type)
_write_field(fd=fd, field_type="varint", count=1, value=tlv_len) _write_field(fd=fd, field_type="bigsize", count=1, value=tlv_len)
_write_field(fd=fd, field_type="byte", count=tlv_len, value=tlv_val) _write_field(fd=fd, field_type="byte", count=tlv_len, value=tlv_val)