From 3f795364376e2eb3d43dd8a19019e0de8b6948ce Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Fri, 8 Jul 2022 10:47:24 +0200 Subject: [PATCH] msggen: Ignore `state_changes` in grpc2py It's being skipped in grpc so we don't have it later anyway. --- contrib/msggen/msggen/gen/grpc2py.py | 6 +++++- contrib/pyln-testing/pyln/testing/grpc2py.py | 11 ----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/contrib/msggen/msggen/gen/grpc2py.py b/contrib/msggen/msggen/gen/grpc2py.py index e0fe5959e..8bc791823 100644 --- a/contrib/msggen/msggen/gen/grpc2py.py +++ b/contrib/msggen/msggen/gen/grpc2py.py @@ -17,7 +17,7 @@ def decamelcase(c): override = { - + 'ListPeers.peers[].channels[].state_changes[]': None, } @@ -92,6 +92,8 @@ class Grpc2PyGenerator(IGenerator): self.converters[field.path] = "str(m.{{name}})" def generate_composite(self, prefix, field: CompositeField): + if override.get(field.path, "") is None: + return name = field.name.normalized() if prefix: prefix = f"{prefix}_{str(name).lower()}" @@ -129,6 +131,8 @@ class Grpc2PyGenerator(IGenerator): self.write(f' "{name}": [{rhs} for i in {rhs}], # ArrayField[primitive] in generate_composite\n', cleanup=False) elif isinstance(f, ArrayField): + if override.get(f.path, "") is None: + continue rhs = self.converters[f.path] self.write(f' "{name}": [{rhs} for i in m.{name}], # ArrayField[composite] in generate_composite\n', cleanup=False) diff --git a/contrib/pyln-testing/pyln/testing/grpc2py.py b/contrib/pyln-testing/pyln/testing/grpc2py.py index dcde4d744..ae0a63940 100644 --- a/contrib/pyln-testing/pyln/testing/grpc2py.py +++ b/contrib/pyln-testing/pyln/testing/grpc2py.py @@ -112,16 +112,6 @@ def listpeers_peers_channels_alias2py(m): }) -def listpeers_peers_channels_state_changes2py(m): - return remove_default({ - "timestamp": m.timestamp, # PrimitiveField in generate_composite - "old_state": str(m.old_state), # EnumField in generate_composite - "new_state": str(m.new_state), # EnumField in generate_composite - "cause": str(m.cause), # EnumField in generate_composite - "message": m.message, # PrimitiveField in generate_composite - }) - - def listpeers_peers_channels_htlcs2py(m): return remove_default({ "direction": str(m.direction), # EnumField in generate_composite @@ -172,7 +162,6 @@ def listpeers_peers_channels2py(m): "their_to_self_delay": m.their_to_self_delay, # PrimitiveField in generate_composite "our_to_self_delay": m.our_to_self_delay, # PrimitiveField in generate_composite "max_accepted_htlcs": m.max_accepted_htlcs, # PrimitiveField in generate_composite - "state_changes": [listpeers_peers_channels_state_changes2py(i) for i in m.state_changes], # ArrayField[composite] in generate_composite "status": [m.status for i in m.status], # ArrayField[primitive] in generate_composite "in_payments_offered": m.in_payments_offered, # PrimitiveField in generate_composite "in_offered_msat": amount2msat(m.in_offered_msat), # PrimitiveField in generate_composite