Merge branch 'master' into fix-flake-test_no_delay-9218

Author: ScuttoZ

contrib/msggen/msggen/gen/grpc2py.py

@@ -83,9 +83,6 @@ def generate(self, service: Service) -> None:
         # `doc/schemas`. Do not edit this file manually as it would get
         # overwritten.
 
-        import json
-
-
         def hexlify(b):
             return b if b is None else b.hex()
 
@@ -109,7 +106,7 @@ def remove_default(d):
         self.write("""\
 
 
-        def decodekeysend_routes2py(m): # manual override
+        def decodekeysend_routes2py(m):  # manual override
             return remove_default({
                 "expirydelta": m.expirydelta,
                 "feebase": amount2msat(m.feebase),
@@ -122,7 +119,7 @@ def decodekeysend_routes2py(m): # manual override
         self.write("""\
 
 
-        def decodepay_routes2py(m): # manual override
+        def decodepay_routes2py(m):  # manual override
             return remove_default({
                 "cltv_expiry_delta": m.cltv_expiry_delta,
                 "fee_base_msat": amount2msat(m.fee_base_msat),
@@ -189,7 +186,7 @@ def {converter_name}(m):
             elif isinstance(f, ArrayField) and isinstance(f.itemtype, PrimitiveField):
                 rhs = self.converters[f.itemtype.typename].format(name=name)
                 self.write(
-                    f'        "{name}": [{rhs} for i in {rhs}], # ArrayField[primitive] in generate_composite\n',
+                    f'        "{name}": [{rhs} for i in {rhs}],  # ArrayField[primitive] in generate_composite\n',
                     cleanup=False,
                 )