Merge pull request #52 from wizardsardine/remove-base64-dep

remove base64 dependency
wizardsardine · Jan 11, 2024 · e467dfe · e467dfe
2 parents 00dbf44 + 965a8fe
commit e467dfe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,7 +29,6 @@ specter = ["tokio", "tokio-serial", "serialport"]
 ledger = ["regex", "tokio", "ledger_bitcoin_client", "ledger-transport-hidapi", "ledger-apdu", "hidapi"]
 
 [dependencies]
-base64 = "0.13.0"
 async-trait = "0.1.52"
 futures = "0.3"
 bitcoin = { version = "0.30.0", default-features = false, features = ["base64", "serde", "no-std"] }

diff --git a/src/specter.rs b/src/specter.rs
@@ -67,15 +67,9 @@ impl<T: Transport> Specter<T> {
 
     pub async fn sign(&self, psbt: &Psbt) -> Result<Psbt, SpecterError> {
         self.transport
-            .request(&format!(
-                "\r\n\r\nsign {}\r\n",
-                base64::encode(psbt.serialize())
-            ))
+            .request(&format!("\r\n\r\nsign {}\r\n", psbt))
             .await
-            .and_then(|resp| base64::decode(resp).map_err(|e| SpecterError::Device(e.to_string())))
-            .and_then(|bytes| {
-                Psbt::deserialize(&bytes).map_err(|e| SpecterError::Device(e.to_string()))
-            })
+            .and_then(|resp| Psbt::from_str(&resp).map_err(|e| SpecterError::Device(e.to_string())))
     }
 }