aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-22 08:34:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

patch message-export-types.patch

Browse Source
This commit is contained in:
Rusty Russell
2020-06-03 10:09:36 +09:30
committed by Christian Decker
parent eb73a0dd8f
commit ed4eadc8f3
4 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/pyln-proto/pyln/proto/message/array_types.py
View File

@@ -1,11 +1,11 @@
#! /usr/bin/python3
from .fundamental_types import FieldType, IntegerType, split_field from .fundamental_types import FieldType, IntegerType, split_field
class ArrayType(FieldType): class ArrayType(FieldType):
"""Abstract class for the different kinds of arrays: these are not in """Abstract class for the different kinds of arrays.
the namespace, but generated when a message says it wants an array of
some type. These are not in the namespace, but generated when a message says it
wants an array of some type.
""" """
def __init__(self, outer, name, elemtype): def __init__(self, outer, name, elemtype):

3
contrib/pyln-proto/pyln/proto/message/fundamental_types.py
View File

@@ -1,4 +1,3 @@
#! /usr/bin/python3
import struct import struct
@@ -42,7 +41,7 @@ These are further specialized.
return self.name return self.name
def __repr__(self): def __repr__(self):
return self.name return 'FieldType({})'.format(self.name)
class IntegerType(FieldType): class IntegerType(FieldType):

1
contrib/pyln-proto/pyln/proto/message/message.py
View File

@@ -1,4 +1,3 @@
#! /usr/bin/python3
import struct import struct
from .fundamental_types import fundamental_types, BigSizeType, split_field from .fundamental_types import fundamental_types, BigSizeType, split_field
from .array_types import ( from .array_types import (

32
contrib/pyln-proto/tests/test_array_types.py
View File

@@ -18,23 +18,23 @@ def test_sized_array():
def __init__(self, name): def __init__(self, name):
self.name = name self.name = name
for test in [[SizedArrayType(dummy("test1"), "test_arr", byte, 4), for arrtype, s, b in [[SizedArrayType(dummy("test1"), "test_arr", byte, 4),
"00010203", "00010203",
bytes([0, 1, 2, 3])], bytes([0, 1, 2, 3])],
[SizedArrayType(dummy("test2"), "test_arr", u16, 4), [SizedArrayType(dummy("test2"), "test_arr", u16, 4),
"[0,1,2,256]", "[0,1,2,256]",
bytes([0, 0, 0, 1, 0, 2, 1, 0])], bytes([0, 0, 0, 1, 0, 2, 1, 0])],
[SizedArrayType(dummy("test3"), "test_arr", scid, 4), [SizedArrayType(dummy("test3"), "test_arr", scid, 4),
"[1x2x3,4x5x6,7x8x9,10x11x12]", "[1x2x3,4x5x6,7x8x9,10x11x12]",
bytes([0, 0, 1, 0, 0, 2, 0, 3] bytes([0, 0, 1, 0, 0, 2, 0, 3]
+ [0, 0, 4, 0, 0, 5, 0, 6] + [0, 0, 4, 0, 0, 5, 0, 6]
+ [0, 0, 7, 0, 0, 8, 0, 9] + [0, 0, 7, 0, 0, 8, 0, 9]
+ [0, 0, 10, 0, 0, 11, 0, 12])]]: + [0, 0, 10, 0, 0, 11, 0, 12])]]:
v, _ = test[0].val_from_str(test[1]) v, _ = arrtype.val_from_str(s)
assert test[0].val_to_str(v, None) == test[1] assert arrtype.val_to_str(v, None) == s
v2, _ = test[0].val_from_bin(test[2], None) v2, _ = arrtype.val_from_bin(b, None)
assert v2 == v assert v2 == v
assert test[0].val_to_bin(v, None) == test[2] assert arrtype.val_to_bin(v, None) == b
def test_ellipsis_array(): def test_ellipsis_array():