Fix clippy warnings in stacks signer

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

Author: jferrant

stacks-signer/src/cli.rs

@@ -222,15 +222,15 @@ impl TryFrom<&str> for Vote {
         match input.to_lowercase().as_str() {
             "yes" => Ok(Vote::Yes),
             "no" => Ok(Vote::No),
-            _ => Err(format!("Invalid vote: {}. Must be `yes` or `no`.", input)),
+            _ => Err(format!("Invalid vote: {input}. Must be `yes` or `no`.")),
         }
     }
 }
 
 impl TryFrom<u8> for Vote {
     type Error = String;
     fn try_from(input: u8) -> Result<Vote, Self::Error> {
-        Vote::from_u8(input).ok_or_else(|| format!("Invalid vote: {}. Must be 0 or 1.", input))
+        Vote::from_u8(input).ok_or_else(|| format!("Invalid vote: {input}. Must be 0 or 1."))
     }
 }
 
@@ -287,7 +287,7 @@ impl ValueEnum for StackingSignatureMethod {
             method => match Pox4SignatureTopic::lookup_by_name(method) {
                 Some(topic) => topic,
                 None => {
-                    return Err(format!("Invalid topic: {}", input));
+                    return Err(format!("Invalid topic: {input}"));
                 }
             },
         };
@@ -328,7 +328,7 @@ pub struct GenerateStackingSignatureArgs {
 
 /// Parse the contract ID
 fn parse_contract(contract: &str) -> Result<QualifiedContractIdentifier, String> {
-    QualifiedContractIdentifier::parse(contract).map_err(|e| format!("Invalid contract: {}", e))
+    QualifiedContractIdentifier::parse(contract).map_err(|e| format!("Invalid contract: {e}"))
 }
 
 /// Parse a BTC address argument and return a `PoxAddress`.
@@ -355,12 +355,12 @@ pub fn parse_pox_addr(pox_address_literal: &str) -> Result<PoxAddress, String> {
 
 /// Parse the hexadecimal Stacks private key
 fn parse_private_key(private_key: &str) -> Result<StacksPrivateKey, String> {
-    StacksPrivateKey::from_hex(private_key).map_err(|e| format!("Invalid private key: {}", e))
+    StacksPrivateKey::from_hex(private_key).map_err(|e| format!("Invalid private key: {e}"))
 }
 
 /// Parse the hexadecimal Stacks public key
 fn parse_public_key(public_key: &str) -> Result<StacksPublicKey, String> {
-    StacksPublicKey::from_hex(public_key).map_err(|e| format!("Invalid public key: {}", e))
+    StacksPublicKey::from_hex(public_key).map_err(|e| format!("Invalid public key: {e}"))
 }
 
 /// Parse the vote
@@ -370,7 +370,7 @@ fn parse_vote(vote: &str) -> Result<Vote, String> {
 
 /// Parse the hexadecimal encoded message signature
 fn parse_message_signature(signature: &str) -> Result<MessageSignature, String> {
-    MessageSignature::from_hex(signature).map_err(|e| format!("Invalid message signature: {}", e))
+    MessageSignature::from_hex(signature).map_err(|e| format!("Invalid message signature: {e}"))
 }
 
 /// Parse the input data
@@ -384,7 +384,7 @@ fn parse_data(data: &str) -> Result<Vec<u8>, String> {
         data.to_string()
     };
     let data =
-        b58::from(&encoded_data).map_err(|e| format!("Failed to decode provided data: {}", e))?;
+        b58::from(&encoded_data).map_err(|e| format!("Failed to decode provided data: {e}"))?;
     Ok(data)
 }
 

stacks-signer/src/client/mod.rs

@@ -346,7 +346,7 @@ pub(crate) mod tests {
             stackerdbs: Some(
                 stackerdb_contract_ids
                     .into_iter()
-                    .map(|cid| format!("{}", cid))
+                    .map(|cid| cid.to_string())
                     .collect(),
             ),
         };

stacks-signer/src/client/stacks_client.rs

@@ -115,7 +115,7 @@ impl StacksClient {
         let stacks_address = StacksAddress::p2pkh(mainnet, &pubkey);
         Self {
             stacks_address,
-            http_origin: format!("http://{}", node_host),
+            http_origin: format!("http://{node_host}"),
             tx_version,
             chain_id,
             stacks_node_client: reqwest::blocking::Client::new(),
@@ -751,7 +751,7 @@ impl StacksClient {
     }
 
     fn tenure_tip_path(&self, consensus_hash: &ConsensusHash) -> String {
-        format!("{}/v3/tenures/tip/{}", self.http_origin, consensus_hash)
+        format!("{}/v3/tenures/tip/{consensus_hash}", self.http_origin)
     }
 }
 

stacks-signer/src/config.rs

@@ -564,7 +564,7 @@ pub fn build_signer_config_tomls(
     let mut signer_config_tomls = vec![];
 
     for stacks_private_key in stacks_private_keys {
-        let endpoint = format!("localhost:{}", port_start);
+        let endpoint = format!("localhost:{port_start}");
         port_start += 1;
 
         let stacks_public_key = StacksPublicKey::from_private(stacks_private_key).to_hex();
@@ -615,7 +615,7 @@ tx_fee_ustx = {tx_fee_ustx}
         }
 
         if let Some(metrics_port) = metrics_port_start {
-            let metrics_endpoint = format!("localhost:{}", metrics_port);
+            let metrics_endpoint = format!("localhost:{metrics_port}");
             signer_config_toml = format!(
                 r#"
 {signer_config_toml}
@@ -709,8 +709,7 @@ Dry run: false
 
         assert!(
             config_str == expected_str_v4 || config_str == expected_str_v6,
-            "Config string does not match expected output. Actual:\n{}",
-            config_str
+            "Config string does not match expected output. Actual:\n{config_str}",
         );
     }
 

stacks-signer/src/main.rs

@@ -84,7 +84,7 @@ fn handle_list_chunks(args: StackerDBArgs) {
     let chunk_list = session.list_chunks().unwrap();
     let chunk_list_json = serde_json::to_string(&chunk_list).unwrap();
     let hexed_json = to_hex(chunk_list_json.as_bytes());
-    println!("{}", hexed_json);
+    println!("{hexed_json}");
 }
 
 fn handle_put_chunk(args: PutChunkArgs) {
@@ -148,15 +148,15 @@ fn handle_generate_stacking_signature(
     };
 
     if do_print {
-        println!("{}", output_str);
+        println!("{output_str}");
     }
 
     signature
 }
 
 fn handle_check_config(args: RunSignerArgs) {
     let config = GlobalConfig::try_from(&args.config).unwrap();
-    println!("Signer version: {}\nConfig: \n{}", *VERSION_STRING, config);
+    println!("Signer version: {}\nConfig: \n{config}", *VERSION_STRING);
 }
 
 fn handle_generate_vote(args: GenerateVoteArgs, do_print: bool) -> MessageSignature {

stacks-signer/src/signerdb.rs

@@ -148,7 +148,7 @@ impl Display for BlockState {
             BlockState::GloballyAccepted => "GloballyAccepted",
             BlockState::GloballyRejected => "GloballyRejected",
         };
-        write!(f, "{}", state)
+        write!(f, "{state}")
     }
 }