rpc: fix test with the new API

Signed-off-by: Vincenzo Palazzo <[email protected]>
standardsats · Mar 10, 2023 · bdb3b0e · bdb3b0e
1 parent f612b56
commit bdb3b0e
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 23 deletions.
diff --git a/common/src/errors.rs b/common/src/errors.rs
@@ -58,9 +58,9 @@ impl From<RpcError> for Error {
 impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match *self {
-            Error::Json(ref e) => write!(f, "JSON decode error: {}", e),
-            Error::Io(ref e) => write!(f, "IO error response: {}", e),
-            Error::Rpc(ref r) => write!(f, "RPC error response: {:?}", r),
+            Error::Json(ref e) => write!(f, "JSON decode error: {e}"),
+            Error::Io(ref e) => write!(f, "IO error response: {e}"),
+            Error::Rpc(ref r) => write!(f, "RPC error response: {r:?}"),
             Error::NoErrorOrResult => write!(f, "Malformed RPC response"),
             Error::NonceMismatch => write!(f, "Nonce of response did not match nonce of request"),
             Error::VersionMismatch => write!(f, "`jsonrpc` field set to non-\"2.0\""),

diff --git a/conf/src/lib.rs b/conf/src/lib.rs
@@ -150,7 +150,7 @@ mod tests {
             .duration_since(UNIX_EPOCH)
             .unwrap()
             .subsec_nanos();
-        format!("{dir}/conf-{}", nanos)
+        format!("{dir}/conf-{nanos}")
     }
 
     fn build_file(content: &str) -> Result<String, std::io::Error> {
@@ -193,7 +193,7 @@ mod tests {
         let result = conf.parse();
         assert!(result.is_ok());
         assert_eq!(conf.fields.keys().len(), 2);
-        println!("{:?}", conf);
+        println!("{conf:?}");
         assert!(conf.fields.contains_key("plugin"));
         assert!(conf.fields.contains_key("network"));
 
@@ -214,7 +214,7 @@ mod tests {
         let result = conf.parse();
         assert!(result.is_ok());
         assert_eq!(conf.fields.get("plugin").unwrap().len(), 2);
-        println!("{:?}", conf);
+        println!("{conf:?}");
         assert!(conf.fields.contains_key("plugin"));
         assert!(conf.fields.contains_key("network"));
 
@@ -248,7 +248,7 @@ mod tests {
             format!("# this is just a commit\nplugin=foo\nnetwork=bitcoin\ninclude {subpath}")
                 .as_str(),
         );
-        assert!(path.is_ok(), "{}", format!("{:?}", path));
+        assert!(path.is_ok(), "{}", format!("{path:?}"));
         let path = path.unwrap();
         let mut conf = CLNConf::new(path.to_string(), false);
         let result = conf.parse();

diff --git a/conf/src/parser.rs b/conf/src/parser.rs
@@ -38,15 +38,15 @@ impl Parser {
             .collect();
         let mut words = vec![];
         for line in lines {
-            if line.starts_with("#") {
+            if line.starts_with('#') {
                 words.push(format!("comment {line}"));
                 continue;
             }
             if line.starts_with("include") {
                 words.push(line);
                 continue;
             }
-            let mut split: Vec<String> = line.split("=").map(|it| it.to_owned()).collect();
+            let mut split: Vec<String> = line.split('=').map(|it| it.to_owned()).collect();
             let key = split.first().unwrap().to_owned();
             split.remove(0);
             let val = if split.is_empty() {
@@ -91,9 +91,7 @@ impl Parser {
         if key.starts_with("include") {
             let value = key.strip_prefix("include ").unwrap().trim();
             let mut subconf = CLNConf::new(value.to_owned(), false);
-            if let Err(err) = subconf.parse() {
-                return Err(err);
-            }
+            subconf.parse()?;
             conf.add_subconf(subconf)?;
         } else {
             let value = stream.advance().to_owned();

diff --git a/plugin/src/plugin.rs b/plugin/src/plugin.rs
@@ -159,7 +159,7 @@ impl<'a, T: 'a + Clone> Plugin<T> {
         if let Err(json_res) = notification.call(self, params) {
             self.log(
                 LogLevel::Debug,
-                format!("Notification end with and error: {}", json_res).as_str(),
+                format!("Notification end with and error: {json_res}").as_str(),
             );
         }
     }

diff --git a/plugin/tests/plugin_integration_test.rs b/plugin/tests/plugin_integration_test.rs
@@ -10,7 +10,7 @@ use std::path::Path;
 pub fn lightningd() -> Client {
     // FIXME(vincenzopalazzo):  Using the env to take the path of the RPC file.
     let sock = Path::new("/workdir/lightning_dir_one/regtest/lightning-rpc");
-    Client::new(&sock)
+    Client::new(sock)
 }
 
 #[rstest]

diff --git a/plugin_macros/tests/plugin_integration_test.rs b/plugin_macros/tests/plugin_integration_test.rs
@@ -10,7 +10,7 @@ use std::path::Path;
 pub fn lightningd() -> Client {
     // FIXME(vincenzopalazzo):  Using the env to take the path of the RPC file.
     let sock = Path::new("/workdir/lightning_dir_one/regtest/lightning-rpc");
-    Client::new(&sock)
+    Client::new(sock)
 }
 
 #[rstest]

diff --git a/rpc/tests/rpc_utility_test.rs b/rpc/tests/rpc_utility_test.rs
@@ -20,16 +20,16 @@ fn wait_for(millisecond: u64) {
 pub fn lightningd() -> LightningRPC {
     // FIXME(vincenzopalazzo):  Using the env to take the path of the RPC file.
     let sock = Path::new("/workdir/lightning_dir_two/regtest/lightning-rpc");
-    let client = LightningRPC::new(&sock);
-    client
+
+    LightningRPC::new(sock)
 }
 
 #[fixture]
 pub fn lightningd_second() -> LightningRPC {
     // FIXME(vincenzopalazzo):  Using the env to take the path of the RPC file.
     let sock = Path::new("/workdir/lightning_dir_one/regtest/lightning-rpc");
-    let client = LightningRPC::new(&sock);
-    client
+
+    LightningRPC::new(sock)
 }
 
 #[rstest]
@@ -54,7 +54,7 @@ fn connect_test_one(lightningd: LightningRPC, lightningd_second: LightningRPC) {
     let host = match addr {
         NetworkAddress::Ipv4 { address, port } => {
             host.push_str(&address.to_string());
-            host.push_str(":");
+            host.push(':');
             host.push_str(&port.to_string());
             host
         }
@@ -73,7 +73,7 @@ fn fundchannel_test_one(lightningd: LightningRPC, lightningd_second: LightningRP
     let host = match addr {
         NetworkAddress::Ipv4 { address, port } => {
             host.push_str(&address.to_string());
-            host.push_str(":");
+            host.push(':');
             host.push_str(&port.to_string());
             host
         }
@@ -97,7 +97,7 @@ fn listinvoice_by_payment_hash_test_one(lightningd: LightningRPC) {
 fn generate_amountless_invoice_test_one(lightningd: LightningRPC) {
     let label = format!("{}", Uuid::new_v4());
     let invoice = lightningd
-        .invoice(None, label.as_str(), "generate an any invoice", None)
+        .invoice(None, label.as_str(), "generate an any invoice", None, None)
         .unwrap();
     let decode = lightningd.decodepay(&invoice.bolt11, None).unwrap();
     assert_eq!(decode.amount_msat, None);
@@ -107,7 +107,13 @@ fn generate_amountless_invoice_test_one(lightningd: LightningRPC) {
 fn generate_invoice_with_amount_test_one(lightningd: LightningRPC) {
     let label = format!("{}", Uuid::new_v4());
     let invoice = lightningd
-        .invoice(Some(1), label.as_str(), "generate an any invoice", None)
+        .invoice(
+            Some(1),
+            label.as_str(),
+            "generate an any invoice",
+            None,
+            None,
+        )
         .unwrap();
     let decode = lightningd.decodepay(&invoice.bolt11, None).unwrap();
     assert_eq!(decode.amount_msat, Some(MSat(1)));