From 706b47587f7527601d71b8b7a3a7fc653362ebd4 Mon Sep 17 00:00:00 2001
From: Christian Decker <decker.christian@gmail.com>
Date: Tue, 20 Jun 2023 16:43:39 +0200
Subject: [PATCH] cln-rpc: Remove wildcard import from model

There is a name clash between request and response for the delinvoicestatus
param.
---
 cln-grpc/src/pb.rs                |  3 ++-
 cln-grpc/src/test.rs              | 13 +++++++------
 cln-rpc/examples/getinfo.rs       |  2 +-
 cln-rpc/src/lib.rs                |  2 +-
 cln-rpc/src/model.rs              |  2 --
 contrib/msggen/msggen/gen/rust.py |  2 --
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/cln-grpc/src/pb.rs b/cln-grpc/src/pb.rs
index 51fd1de3f..ec86425c6 100644
--- a/cln-grpc/src/pb.rs
+++ b/cln-grpc/src/pb.rs
@@ -447,7 +447,8 @@ mod convert {
                 }
               ]
             });
-            let u: cln_rpc::model::ListpeersResponse = serde_json::from_value(j).unwrap();
+            let u: cln_rpc::model::responses::ListpeersResponse =
+                serde_json::from_value(j).unwrap();
             let _g: ListpeersResponse = u.into();
         }
     }
diff --git a/cln-grpc/src/test.rs b/cln-grpc/src/test.rs
index 33ee185c2..2b393a2b6 100644
--- a/cln-grpc/src/test.rs
+++ b/cln-grpc/src/test.rs
@@ -220,8 +220,9 @@ fn test_listpeers() {
         }
       ]
     });
-    let u: cln_rpc::model::ListpeersResponse = serde_json::from_value(j.clone()).unwrap();
-    let _l: ListpeersResponse = u.into();
+    let u: cln_rpc::model::responses::ListpeersResponse =
+        serde_json::from_value(j.clone()).unwrap();
+    let _l: cln_rpc::model::responses::ListpeersResponse = u.into();
     //let u2: cln_rpc::model::ListpeersResponse = l.into();
     //let j2 = serde_json::to_value(u2).unwrap();
     println!("{}", j);
@@ -246,7 +247,7 @@ fn test_getinfo() {
 	    "network": "regtest",
 	    "fees_collected_msat": "0msat", "lightning-dir": "/tmp/ltests-20irp76f/test_pay_variants_1/lightning-1/regtest",
 	    "our_features": {"init": "8808226aa2", "node": "80008808226aa2", "channel": "", "invoice": "024200"}});
-    let u: cln_rpc::model::GetinfoResponse = serde_json::from_value(j.clone()).unwrap();
+    let u: cln_rpc::model::responses::GetinfoResponse = serde_json::from_value(j.clone()).unwrap();
     let _g: GetinfoResponse = u.into();
     //let u2: cln_rpc::model::GetinfoResponse = g.into();
     //let j2 = serde_json::to_value(u2).unwrap();
@@ -294,7 +295,7 @@ fn test_keysend() {
             extratlvs: None,
         };
 
-    let u: cln_rpc::model::KeysendRequest = g.into();
+    let u: cln_rpc::model::requests::KeysendRequest = g.into();
     let _ser = serde_json::to_string(&u);
 
     let j = r#"{
@@ -309,12 +310,12 @@ fn test_keysend() {
 	"payment_preimage": "e56c22b9ed85560b021e1577daad5742502d25c0c2f636b817f5c0c7580a66a8",
 	"status": "complete"
     }"#;
-    let u: cln_rpc::model::KeysendResponse = serde_json::from_str(j).unwrap();
+    let u: cln_rpc::model::responses::KeysendResponse = serde_json::from_str(j).unwrap();
     let g: KeysendResponse = u.clone().into();
     println!("{:?}", g);
 
     let v: serde_json::Value = serde_json::to_value(u.clone()).unwrap();
-    let g: cln_rpc::model::KeysendResponse = u.into();
+    let g: cln_rpc::model::responses::KeysendResponse = u.into();
     let v2 = serde_json::to_value(g).unwrap();
     assert_eq!(v, v2);
 }
diff --git a/cln-rpc/examples/getinfo.rs b/cln-rpc/examples/getinfo.rs
index b9887d8e7..35e32c2cf 100644
--- a/cln-rpc/examples/getinfo.rs
+++ b/cln-rpc/examples/getinfo.rs
@@ -1,5 +1,5 @@
 use anyhow::{anyhow, Context};
-use cln_rpc::{model::GetinfoRequest, ClnRpc, Request};
+use cln_rpc::{model::requests::GetinfoRequest, ClnRpc, Request};
 use std::env::args;
 use std::path::Path;
 use tokio;
diff --git a/cln-rpc/src/lib.rs b/cln-rpc/src/lib.rs
index 51f2b53ca..84e94abda 100644
--- a/cln-rpc/src/lib.rs
+++ b/cln-rpc/src/lib.rs
@@ -159,7 +159,7 @@ mod test {
 
         let mut read = FramedRead::new(uds2, JsonCodec::default());
         tokio::task::spawn(async move {
-            let _: GetinfoResponse = cln.call_typed(req).await.unwrap();
+            let _: responses::GetinfoResponse = cln.call_typed(req).await.unwrap();
         });
 
         let read_req = dbg!(read.next().await.unwrap().unwrap());
diff --git a/cln-rpc/src/model.rs b/cln-rpc/src/model.rs
index ef05ac4cd..c7eff5d4f 100644
--- a/cln-rpc/src/model.rs
+++ b/cln-rpc/src/model.rs
@@ -9,8 +9,6 @@
 //! this file was generated from
 
 use serde::{Deserialize, Serialize};
-pub use requests::*;
-pub use responses::*;
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(tag = "method", content = "params")]
diff --git a/contrib/msggen/msggen/gen/rust.py b/contrib/msggen/msggen/gen/rust.py
index 88a113b92..9a89b846f 100644
--- a/contrib/msggen/msggen/gen/rust.py
+++ b/contrib/msggen/msggen/gen/rust.py
@@ -293,8 +293,6 @@ class RustGenerator(IGenerator):
         """
         self.write(f"""\
         use serde::{{Deserialize, Serialize}};
-        pub use requests::*;
-        pub use responses::*;
 
         #[derive(Clone, Debug, Serialize, Deserialize)]
         #[serde(tag = "method", content = "params")]