From 3b2c9109dd2c16e3812feb06f322ff0e6b6a61a0 Mon Sep 17 00:00:00 2001
From: Antoine Poinsot <darosior@protonmail.com>
Date: Sat, 5 Nov 2022 11:51:45 +0100
Subject: [PATCH] Clippy fixes

Clippy just broke under our feets by enabling more checks and making CI
fail...
---
 src/descriptors.rs    | 6 +++---
 src/jsonrpc/api.rs    | 2 +-
 src/jsonrpc/server.rs | 2 +-
 src/lib.rs            | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/descriptors.rs b/src/descriptors.rs
index 40fabdc2..2dc6e300 100644
--- a/src/descriptors.rs
+++ b/src/descriptors.rs
@@ -20,7 +20,7 @@ use serde::{Deserialize, Serialize};
 #[derive(Debug)]
 pub enum DescCreationError {
     InsaneTimelock(u32),
-    InvalidKey(descriptor::DescriptorPublicKey),
+    InvalidKey(Box<descriptor::DescriptorPublicKey>),
     Miniscript(miniscript::Error),
     IncompatibleDesc,
     DerivedKeyParsing,
@@ -233,7 +233,7 @@ impl str::FromStr for MultipathDescriptor {
             }
         });
         if let Some(key) = invalid_key {
-            return Err(DescCreationError::InvalidKey(key));
+            return Err(DescCreationError::InvalidKey(key.into()));
         }
 
         // Semantic of the Miniscript must be either the owner now, or the heir after
@@ -334,7 +334,7 @@ impl MultipathDescriptor {
             .iter()
             .find(|k| !is_valid_desc_key(k))
         {
-            return Err(DescCreationError::InvalidKey((**key).clone()));
+            return Err(DescCreationError::InvalidKey((**key).clone().into()));
         }
 
         let owner_pk = Miniscript::from_ast(Terminal::Check(sync::Arc::from(
diff --git a/src/jsonrpc/api.rs b/src/jsonrpc/api.rs
index dd0e3a8a..0d034643 100644
--- a/src/jsonrpc/api.rs
+++ b/src/jsonrpc/api.rs
@@ -52,7 +52,7 @@ fn update_spend(control: &DaemonControl, params: Params) -> Result<serde_json::V
         .get(0, "psbt")
         .ok_or_else(|| Error::invalid_params("Missing 'psbt' parameter."))?
         .as_str()
-        .and_then(|s| base64::decode(&s).ok())
+        .and_then(|s| base64::decode(s).ok())
         .and_then(|bytes| consensus::deserialize(&bytes).ok())
         .ok_or_else(|| Error::invalid_params("Invalid 'psbt' parameter."))?;
     control.update_spend(psbt)?;
diff --git a/src/jsonrpc/server.rs b/src/jsonrpc/server.rs
index 29acaa0b..b281b0a2 100644
--- a/src/jsonrpc/server.rs
+++ b/src/jsonrpc/server.rs
@@ -249,7 +249,7 @@ mod tests {
     }
 
     fn write_messages(socket_path: &path::Path, messages: &[&[u8]]) {
-        let mut client = net::UnixStream::connect(&socket_path).unwrap();
+        let mut client = net::UnixStream::connect(socket_path).unwrap();
         for mess in messages {
             client.write_all(mess).unwrap();
             // Simulate throttling, this mimics real conditions and actually triggered a crash.
diff --git a/src/lib.rs b/src/lib.rs
index 19271982..2bb5247c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -583,10 +583,10 @@ mod tests {
         ]
         .iter()
         .collect();
-        fs::write(&cookie, &[0; 32]).unwrap(); // Will overwrite should it exist already
+        fs::write(&cookie, [0; 32]).unwrap(); // Will overwrite should it exist already
         let addr: net::SocketAddr =
             net::SocketAddrV4::new(net::Ipv4Addr::new(127, 0, 0, 1), 0).into();
-        let server = net::TcpListener::bind(&addr).unwrap();
+        let server = net::TcpListener::bind(addr).unwrap();
         let addr = server.local_addr().unwrap();
         let bitcoin_config = BitcoinConfig {
             network,