msggen: comply with grpc and rust naming conventions

Changelog-Changed: Some enums, structs, functions in pyln-grpc-proto/cln-grpc/cln-rpc
have been slightly renamed so they follow grpc and rust's naming convention

cln-rpc/src/notifications.rs

@@ -1,4 +1,3 @@
-#![allow(non_camel_case_types)]
 // This file is autogenerated by `msggen`
 // Do not edit it manually, your changes will be overwritten
 
@@ -44,6 +43,7 @@ pub struct ChannelOpenedNotification {
 
 /// ['Direction of the connection']
 #[derive(Copy, Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
+#[allow(non_camel_case_types)]
 pub enum ConnectDirection {
     #[serde(rename = "in")]
     IN = 0,
@@ -73,6 +73,7 @@ impl ToString for ConnectDirection {
 
 /// ['Type of connection (*torv2*/*torv3* only if **direction** is *out*)']
 #[derive(Copy, Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
+#[allow(non_camel_case_types)]
 pub enum ConnectAddressType {
     #[serde(rename = "local socket")]
     LOCAL_SOCKET = 0,
@@ -141,7 +142,8 @@ pub struct CustomMsgNotification {
 
 /// ['The cause of the state change.']
 #[derive(Copy, Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
-pub enum Channel_state_changedCause {
+#[allow(non_camel_case_types)]
+pub enum ChannelStateChangedCause {
     #[serde(rename = "unknown")]
     UNKNOWN = 0,
     #[serde(rename = "local")]
@@ -156,38 +158,38 @@ pub enum Channel_state_changedCause {
     ONCHAIN = 5,
 }
 
-impl TryFrom<i32> for Channel_state_changedCause {
+impl TryFrom<i32> for ChannelStateChangedCause {
     type Error = anyhow::Error;
-    fn try_from(c: i32) -> Result<Channel_state_changedCause, anyhow::Error> {
+    fn try_from(c: i32) -> Result<ChannelStateChangedCause, anyhow::Error> {
         match c {
-    0 => Ok(Channel_state_changedCause::UNKNOWN),
-    1 => Ok(Channel_state_changedCause::LOCAL),
-    2 => Ok(Channel_state_changedCause::USER),
-    3 => Ok(Channel_state_changedCause::REMOTE),
-    4 => Ok(Channel_state_changedCause::PROTOCOL),
-    5 => Ok(Channel_state_changedCause::ONCHAIN),
-            o => Err(anyhow::anyhow!("Unknown variant {} for enum Channel_state_changedCause", o)),
+    0 => Ok(ChannelStateChangedCause::UNKNOWN),
+    1 => Ok(ChannelStateChangedCause::LOCAL),
+    2 => Ok(ChannelStateChangedCause::USER),
+    3 => Ok(ChannelStateChangedCause::REMOTE),
+    4 => Ok(ChannelStateChangedCause::PROTOCOL),
+    5 => Ok(ChannelStateChangedCause::ONCHAIN),
+            o => Err(anyhow::anyhow!("Unknown variant {} for enum ChannelStateChangedCause", o)),
         }
     }
 }
 
-impl ToString for Channel_state_changedCause {
+impl ToString for ChannelStateChangedCause {
     fn to_string(&self) -> String {
         match self {
-            Channel_state_changedCause::UNKNOWN => "UNKNOWN",
-            Channel_state_changedCause::LOCAL => "LOCAL",
-            Channel_state_changedCause::USER => "USER",
-            Channel_state_changedCause::REMOTE => "REMOTE",
-            Channel_state_changedCause::PROTOCOL => "PROTOCOL",
-            Channel_state_changedCause::ONCHAIN => "ONCHAIN",
+            ChannelStateChangedCause::UNKNOWN => "UNKNOWN",
+            ChannelStateChangedCause::LOCAL => "LOCAL",
+            ChannelStateChangedCause::USER => "USER",
+            ChannelStateChangedCause::REMOTE => "REMOTE",
+            ChannelStateChangedCause::PROTOCOL => "PROTOCOL",
+            ChannelStateChangedCause::ONCHAIN => "ONCHAIN",
         }.to_string()
     }
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct ChannelStateChangedNotification {
     // Path `channel_state_changed.cause`
-    pub cause: Channel_state_changedCause,
+    pub cause: ChannelStateChangedCause,
     // Path `channel_state_changed.new_state`
     pub new_state: ChannelState,
     // Path `channel_state_changed.old_state`

cln-rpc/src/primitives.rs

@@ -12,7 +12,7 @@ use std::string::ToString;
 pub use bitcoin::hashes::sha256::Hash as Sha256;
 pub use bitcoin::secp256k1::PublicKey;
 
-#[derive(Copy, Clone, Serialize, Deserialize, Debug, PartialEq)]
+#[derive(Copy, Clone, Serialize, Deserialize, Debug, PartialEq, Eq)]
 #[allow(non_camel_case_types)]
 pub enum ChannelState {
     OPENINGD = 0,
@@ -31,7 +31,7 @@ pub enum ChannelState {
     DUALOPEND_OPEN_COMMIT_READY = 13,
 }
 
-#[derive(Copy, Clone, Serialize, Deserialize, Debug)]
+#[derive(Copy, Clone, Serialize, Deserialize, Debug, PartialEq, Eq)]
 #[allow(non_camel_case_types)]
 pub enum HtlcState {
     SENT_ADD_HTLC = 0,
@@ -402,7 +402,7 @@ impl<'de> Deserialize<'de> for Outpoint {
     }
 }
 
-#[derive(Copy, Clone, Serialize, Deserialize, Debug, PartialEq)]
+#[derive(Copy, Clone, Serialize, Deserialize, Debug, PartialEq, Eq)]
 #[serde(rename_all = "lowercase")]
 pub enum ChannelSide {
     LOCAL,

contrib/msggen/msggen/gen/rpc/notification.py

@@ -33,7 +33,6 @@ def generate_enum(self, service: Service):
         self.write("}\n")
 
     def generate(self, service: Service) -> None:
-        self.write("#![allow(non_camel_case_types)]\n")
         self.write("// This file is autogenerated by `msggen`\n")
         self.write("// Do not edit it manually, your changes will be overwritten\n\n\n")
         self.write("\n")

contrib/msggen/msggen/gen/rpc/rust.py

@@ -48,8 +48,7 @@
     "integer": "i64",
 }
 
-header = f"""#![allow(non_camel_case_types)]
-//
+header = f"""
 // This file was automatically generated using the following command:
 //
 // ```bash
@@ -98,7 +97,7 @@ def gen_enum(e, meta):
 
     if e.deprecated:
         decl += "#[deprecated]\n"
-    decl += f"#[derive(Copy, Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]\npub enum {e.typename} {{\n"
+    decl += f"#[derive(Copy, Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]\n#[allow(non_camel_case_types)]\npub enum {e.typename} {{\n"
 
     m = meta["grpc-field-map"]
     m2 = meta["grpc-enum-map"]
@@ -395,7 +394,7 @@ def generate_enums(self, service: Service):
         )
 
         for method in service.methods:
-            if "-" in method.name_raw:
+            if "-" in method.name_raw or "_" in method.name_raw:
                 self.write(
                     f'#[serde(rename = "{method.name_raw.lower()}")]\n', numindent=1
                 )
@@ -415,7 +414,7 @@ def generate_enums(self, service: Service):
         )
 
         for method in service.methods:
-            if "-" in method.name_raw:
+            if "-" in method.name_raw or "_" in method.name_raw:
                 self.write(
                     f'#[serde(rename = "{method.name_raw.lower()}")]\n', numindent=1
                 )

contrib/msggen/msggen/model.py

@@ -1,12 +1,13 @@
 from typing import List, Union, Optional
 import logging
+import re
 from copy import copy
 
 logger = logging.getLogger(__name__)
 
 
 def path2type(path):
-    typename = "".join([s.capitalize() for s in path.replace("[]", "").split(".")])
+    typename = "".join([s.capitalize() for s in re.split(r'_|\.', path.replace("[]", ""))])
     return typename
 
 
@@ -18,7 +19,6 @@ def normalized(self):
         name = {
             "type": "item_type"
         }.get(self.name, self.name)
-
         name = name.replace(' ', '_').replace('-', '_').replace('[]', '').replace("/", "_")
         return name
 
@@ -188,7 +188,7 @@ def __init__(self, name: str, typename: str, request: Field, response: Field):
 
 class Method:
     def __init__(self, name: str, request: Field, response: Field):
-        self.name = name
+        self.name = name.replace('_', '')
         self.name_raw = name
         self.request = request
         self.response = response