Fix clippy warnings in libsigner

Signed-off-by: Jacinta Ferrant <[email protected]>

Author: jferrant

libsigner/src/events.rs

@@ -620,7 +620,7 @@ impl NewBlockTransaction {
             Ok(None)
         } else {
             let tx_bytes = hex_bytes(&self.raw_tx).map_err(|e| {
-                CodecError::DeserializeError(format!("Failed to deserialize raw tx: {}", e))
+                CodecError::DeserializeError(format!("Failed to deserialize raw tx: {e}"))
             })?;
             let tx = StacksTransaction::consensus_deserialize(&mut &tx_bytes[..])?;
             Ok(Some(tx))

libsigner/src/http.rs

@@ -107,8 +107,7 @@ pub fn decode_http_request(payload: &[u8]) -> Result<SignerHttpRequest, EventErr
                 let key = req.headers[i].name.to_string().to_lowercase();
                 if headers.get(&key).is_some() {
                     return Err(EventError::MalformedRequest(format!(
-                        "Invalid HTTP request: duplicate header \"{}\"",
-                        key
+                        "Invalid HTTP request: duplicate header \"{key}\""
                     )));
                 }
                 headers.insert(key, value);
@@ -152,8 +151,7 @@ pub fn decode_http_response(payload: &[u8]) -> Result<(HashMap<String, String>,
             if let Some(version) = resp.version {
                 if version != 0 && version != 1 {
                     return Err(RPCError::MalformedResponse(format!(
-                        "Unrecognized HTTP code {}",
-                        version
+                        "Unrecognized HTTP code {version}"
                     )));
                 }
             } else {
@@ -180,8 +178,7 @@ pub fn decode_http_response(payload: &[u8]) -> Result<(HashMap<String, String>,
                 let key = resp.headers[i].name.to_string().to_lowercase();
                 if headers.contains_key(&key) {
                     return Err(RPCError::MalformedResponse(format!(
-                        "Invalid HTTP respuest: duplicate header \"{}\"",
-                        key
+                        "Invalid HTTP respuest: duplicate header \"{key}\""
                     )));
                 }
                 headers.insert(key, value);
@@ -237,13 +234,11 @@ pub fn run_http_request<S: Read + Write>(
 
     let req_txt = if let Some(content_type) = content_type {
         format!(
-            "{} {} HTTP/1.1\r\nHost: {}\r\nConnection: close\r\nContent-Type: {}\r\n{}User-Agent: libsigner/0.1\r\nAccept: */*\r\n\r\n",
-            verb, path, host, content_type, content_length_hdr
+            "{verb} {path} HTTP/1.1\r\nHost: {host}\r\nConnection: close\r\nContent-Type: {content_type}\r\n{content_length_hdr}User-Agent: libsigner/0.1\r\nAccept: */*\r\n\r\n"
         )
     } else {
         format!(
-            "{} {} HTTP/1.1\r\nHost: {}\r\nConnection: close\r\n{}User-Agent: libsigner/0.1\r\nAccept: */*\r\n\r\n",
-            verb, path, host, content_length_hdr
+            "{verb} {path} HTTP/1.1\r\nHost: {host}\r\nConnection: close\r\n{content_length_hdr}User-Agent: libsigner/0.1\r\nAccept: */*\r\n\r\n"
         )
     };
     debug!("HTTP request\n{}", &req_txt);

libsigner/src/libsigner.rs

@@ -88,5 +88,5 @@ lazy_static! {
 
 #[test]
 fn test_version_string() {
-    assert!(VERSION_STRING.contains(format!("stacks-signer {}", STACKS_SIGNER_VERSION).as_str()));
+    assert!(VERSION_STRING.contains(format!("stacks-signer {STACKS_SIGNER_VERSION}").as_str()));
 }

libsigner/src/runloop.rs

@@ -170,7 +170,7 @@ pub fn set_runloop_signal_handler<ST: EventStopSignaler + Send + 'static>(mut st
             }
         }
         _ => {
-            let msg = format!("Graceful termination request received (signal `{}`), will complete the ongoing runloop cycles and terminate\n", sig_id);
+            let msg = format!("Graceful termination request received (signal `{sig_id}`), will complete the ongoing runloop cycles and terminate\n");
             async_safe_write_stderr(&msg);
             stop_signaler.send();
         }

libsigner/src/tests/mod.rs

@@ -229,15 +229,12 @@ fn test_status_endpoint() {
         let mut sock = match TcpStream::connect(endpoint) {
             Ok(sock) => sock,
             Err(e) => {
-                eprint!("Error connecting to {}: {}", endpoint, e);
+                eprint!("Error connecting to {endpoint}: {e}");
                 sleep_ms(100);
                 return;
             }
         };
-        let req = format!(
-            "GET /status HTTP/1.1\r\nHost: {}\r\nConnection: close\r\n\r\n",
-            endpoint
-        );
+        let req = format!("GET /status HTTP/1.1\r\nHost: {endpoint}\r\nConnection: close\r\n\r\n");
 
         sock.write_all(req.as_bytes()).unwrap();
         let mut buf = [0; 128];

libsigner/src/v0/messages.rs

@@ -1725,7 +1725,7 @@ impl StacksMessageCodec for RejectReason {
 impl std::fmt::Display for RejectCode {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         match self {
-            RejectCode::ValidationFailed(code) => write!(f, "Validation failed: {:?}", code),
+            RejectCode::ValidationFailed(code) => write!(f, "Validation failed: {code:?}"),
             RejectCode::ConnectivityIssues(reason) => write!(
                 f,
                 "The block was rejected due to connectivity issues with the signer: {reason}"
@@ -1754,7 +1754,7 @@ impl std::fmt::Display for RejectCode {
 impl std::fmt::Display for RejectReason {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         match self {
-            RejectReason::ValidationFailed(code) => write!(f, "Validation failed: {:?}", code),
+            RejectReason::ValidationFailed(code) => write!(f, "Validation failed: {code:?}"),
             RejectReason::ConnectivityIssues(reason) => write!(
                 f,
                 "The block was rejected due to connectivity issues with the signer: {reason}"
@@ -1830,7 +1830,7 @@ impl std::fmt::Display for RejectReason {
                 )
             }
             RejectReason::Unknown(code) => {
-                write!(f, "Unknown reject code: {}", code)
+                write!(f, "Unknown reject code: {code}")
             }
             RejectReason::NotRejected => {
                 write!(f, "The block was approved, no rejection details needed.")
@@ -1870,9 +1870,7 @@ mod test {
         let slot_identifiers_len = MessageSlotID::ALL.len();
         assert!(
             SIGNER_SLOTS_PER_USER as usize >= slot_identifiers_len,
-            "stacks_common::SIGNER_SLOTS_PER_USER ({}) must be >= slot identifiers ({})",
-            SIGNER_SLOTS_PER_USER,
-            slot_identifiers_len,
+            "stacks_common::SIGNER_SLOTS_PER_USER ({SIGNER_SLOTS_PER_USER}) must be >= slot identifiers ({slot_identifiers_len})"
         );
     }