From 18569ee8a5162a09a5a5720146ed1ebeccc9e3eb Mon Sep 17 00:00:00 2001 From: parazyd Date: Thu, 13 Jan 2022 19:20:05 +0100 Subject: [PATCH] bin/cashierd: Clippy fixes. --- bin/cashierd/src/service/btc.rs | 2 +- bin/cashierd/src/service/sol.rs | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/cashierd/src/service/btc.rs b/bin/cashierd/src/service/btc.rs index 3d9c76d04..a025d4819 100644 --- a/bin/cashierd/src/service/btc.rs +++ b/bin/cashierd/src/service/btc.rs @@ -351,7 +351,7 @@ impl BtcClient { main_keypair = deserialize(&main_keypairs[main_keypairs.len() - 1].secret_key)?; } } else { - let keypair_str = load_keypair_to_str(expand_path(&keypair_path)?)?; + let keypair_str = load_keypair_to_str(expand_path(keypair_path)?)?; let keypair_bytes: Vec = serde_json::from_str(&keypair_str)?; main_keypair = Keypair::from_bytes(&keypair_bytes) .map_err(|e| BtcFailed::DecodeAndEncodeError(e.to_string()))?; diff --git a/bin/cashierd/src/service/sol.rs b/bin/cashierd/src/service/sol.rs index 630c9cf5d..b571e71ff 100644 --- a/bin/cashierd/src/service/sol.rs +++ b/bin/cashierd/src/service/sol.rs @@ -613,9 +613,8 @@ impl Encodable for SolPubkey { impl Decodable for SolPubkey { fn decode(mut d: D) -> darkfi::Result { let key: String = Decodable::decode(&mut d)?; - let key = Pubkey::try_from(key.as_str()).map_err(|_| { - darkfi::Error::DecodeError("SOL BRIDGE: load public key from slice".into()) - })?; + let key = Pubkey::try_from(key.as_str()) + .map_err(|_| darkfi::Error::DecodeError("SOL BRIDGE: load public key from slice"))?; Ok(SolPubkey(key)) } }