parazyd 4 лет назад
Родитель
Сommit
18569ee8a5
2 измененных файлов с 3 добавлено и 4 удалено
  1. 1 1
      bin/cashierd/src/service/btc.rs
  2. 2 3
      bin/cashierd/src/service/sol.rs

+ 1 - 1
bin/cashierd/src/service/btc.rs

@@ -351,7 +351,7 @@ impl BtcClient {
                 main_keypair = deserialize(&main_keypairs[main_keypairs.len() - 1].secret_key)?;
                 main_keypair = deserialize(&main_keypairs[main_keypairs.len() - 1].secret_key)?;
             }
             }
         } else {
         } 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<u8> = serde_json::from_str(&keypair_str)?;
             let keypair_bytes: Vec<u8> = serde_json::from_str(&keypair_str)?;
             main_keypair = Keypair::from_bytes(&keypair_bytes)
             main_keypair = Keypair::from_bytes(&keypair_bytes)
                 .map_err(|e| BtcFailed::DecodeAndEncodeError(e.to_string()))?;
                 .map_err(|e| BtcFailed::DecodeAndEncodeError(e.to_string()))?;

+ 2 - 3
bin/cashierd/src/service/sol.rs

@@ -613,9 +613,8 @@ impl Encodable for SolPubkey {
 impl Decodable for SolPubkey {
 impl Decodable for SolPubkey {
     fn decode<D: std::io::Read>(mut d: D) -> darkfi::Result<Self> {
     fn decode<D: std::io::Read>(mut d: D) -> darkfi::Result<Self> {
         let key: String = Decodable::decode(&mut d)?;
         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))
         Ok(SolPubkey(key))
     }
     }
 }
 }