diff --git a/contrib/msggen/msggen/gen/grpc/convert.py b/contrib/msggen/msggen/gen/grpc/convert.py
index f96ac63d7f2f..9e3b77f7672a 100644
--- a/contrib/msggen/msggen/gen/grpc/convert.py
+++ b/contrib/msggen/msggen/gen/grpc/convert.py
@@ -17,14 +17,14 @@ def generate_array(self, prefix, field: ArrayField, override):
         if isinstance(field.itemtype, CompositeField):
             self.generate_composite(prefix, field.itemtype, override)
 
-    def generate_composite(self, prefix, field: CompositeField, override = None):
+    def generate_composite(self, prefix, field: CompositeField, override=None):
         """Generates the conversions from JSON-RPC to GRPC.
         """
         if field.omit():
             return
-        
+
         if override is None:
-            override = lambda x : x
+            override = lambda x: x
 
         # First pass: generate any sub-fields before we generate the
         # top-level field itself.
diff --git a/contrib/msggen/msggen/gen/grpc/proto.py b/contrib/msggen/msggen/gen/grpc/proto.py
index e5aa57ef2d8c..c523c8261f84 100644
--- a/contrib/msggen/msggen/gen/grpc/proto.py
+++ b/contrib/msggen/msggen/gen/grpc/proto.py
@@ -86,7 +86,7 @@ def enumerate_enum(self, typename, variants):
         for v in variants:
             yield (self.enumvar2number(typename, v), v)
 
-    def gather_method_types(self, methods : List[Method]):
+    def gather_method_types(self, methods: List[Method]):
         """Gather all types that might need to be defined.
         """
         types = []
@@ -98,8 +98,8 @@ def gather_method_types(self, methods : List[Method]):
                 types.extend(gather_subfields(field))
 
         return types
-    
-    def gather_notification_types(self, notifications : List[Notification]):
+
+    def gather_notification_types(self, notifications: List[Notification]):
         """Gather all types that might need to be defined
         to represent notifications
         """
@@ -130,15 +130,14 @@ def generate_service(self, service: Service) -> None:
             response_type_name = notification_typename_overrides(notification.response.typename)
             self.write(
                 f"	rpc Subscribe{name}({notification.request.typename}) returns (stream {response_type_name}) {{}}\n",
-                cleanup=False) 
+                cleanup=False)
 
         self.write(f"""}}
         """)
 
-    def generate_enum(self, e: EnumField, indent=0, typename_override = None):
+    def generate_enum(self, e: EnumField, indent=0, typename_override=None):
         if typename_override is None:
-            typename_override = lambda x : x
-
+            typename_override = lambda x: x
 
         self.logger.debug(f"Generating enum {e}")
         prefix = "\t" * indent
@@ -151,14 +150,14 @@ def generate_enum(self, e: EnumField, indent=0, typename_override = None):
 
         self.write(f"""{prefix}}}\n""", False)
 
-    def generate_message(self, message: CompositeField, typename_override = None):
+    def generate_message(self, message: CompositeField, typename_override=None):
         if message.omit():
             return
 
-        # If override is not specified it is a function that returns itself 
+        # If override is not specified it is a function that returns itself
         # This is equivalent to do not override
         if typename_override is None:
-            typename_override = lambda x : x
+            typename_override = lambda x: x
 
         self.write(f"""
         message {typename_override(message.typename)} {{
@@ -220,6 +219,7 @@ def generate(self, service: Service) -> None:
         for message in [f for f in notification_fields if isinstance(f, CompositeField)]:
             self.generate_message(message, notification_typename_overrides)
 
+
 def gather_subfields(field: Field) -> List[Field]:
     fields = [field]
 
@@ -231,4 +231,3 @@ def gather_subfields(field: Field) -> List[Field]:
         fields.extend(gather_subfields(field.itemtype))
 
     return fields
-
diff --git a/contrib/msggen/msggen/gen/grpc/server.py b/contrib/msggen/msggen/gen/grpc/server.py
index 7490a3135ffd..c4fca53f31b3 100644
--- a/contrib/msggen/msggen/gen/grpc/server.py
+++ b/contrib/msggen/msggen/gen/grpc/server.py
@@ -155,7 +155,7 @@ def generate(self, service: Service) -> None:
             typename = str(notification.typename)
             snake_name = camel_to_snake(typename)
             response_name = notification_typename_overrides(str(notification.response.typename))
-            stream_request= f"Stream{typename}Request"
+            stream_request = f"Stream{typename}Request"
             stream_name = f"Subscribe{notification.typename}Stream"
             self.write(f"""
 
diff --git a/contrib/msggen/msggen/gen/grpc/unconvert.py b/contrib/msggen/msggen/gen/grpc/unconvert.py
index 178d05a9f2b0..10e4f16d02a4 100644
--- a/contrib/msggen/msggen/gen/grpc/unconvert.py
+++ b/contrib/msggen/msggen/gen/grpc/unconvert.py
@@ -12,14 +12,14 @@ def generate(self, service: Service):
         # TODO Temporarily disabled since the use of overrides is lossy
         # self.generate_responses(service)
 
-    def generate_composite(self, prefix, field: CompositeField, override = None) -> None:
+    def generate_composite(self, prefix, field: CompositeField, override=None) -> None:
         # First pass: generate any sub-fields before we generate the
         # top-level field itself.
         if field.omit():
             return
-        
+
         if override is None:
-            override = lambda x : x
+            override = lambda x: x
 
         for f in field.fields:
             if isinstance(f, ArrayField):
diff --git a/contrib/msggen/msggen/gen/grpc/util.py b/contrib/msggen/msggen/gen/grpc/util.py
index c5bf42e9e5df..97a4c212c3cb 100644
--- a/contrib/msggen/msggen/gen/grpc/util.py
+++ b/contrib/msggen/msggen/gen/grpc/util.py
@@ -48,7 +48,6 @@ def notification_typename_overrides(typename: str):
     else:
         return_class = str
 
-
     if str(typename).startswith("Connect"):
         return return_class(f"Peer{typename}")
     else: