feat(api)!: relay_fee returns bitcoin::Amount

Author: ValuedMammal

src/api.rs

@@ -5,7 +5,7 @@ use std::convert::TryInto;
 use std::ops::Deref;
 
 use bitcoin::consensus::encode::{deserialize, serialize};
-use bitcoin::{block, Script, Transaction, Txid};
+use bitcoin::{block, Amount, Script, Transaction, Txid};
 
 use crate::batch::Batch;
 use crate::types::*;
@@ -46,7 +46,7 @@ where
         (**self).estimate_fee(number)
     }
 
-    fn relay_fee(&self) -> Result<f64, Error> {
+    fn relay_fee(&self) -> Result<Amount, Error> {
         (**self).relay_fee()
     }
 
@@ -270,8 +270,8 @@ pub trait ElectrumApi {
     /// Estimates the fee required in **Bitcoin per kilobyte** to confirm a transaction in `number` blocks.
     fn estimate_fee(&self, number: usize) -> Result<f64, Error>;
 
-    /// Returns the minimum accepted fee by the server's node in **Bitcoin, not Satoshi**.
-    fn relay_fee(&self) -> Result<f64, Error>;
+    /// Returns the minimum accepted fee by the server's node.
+    fn relay_fee(&self) -> Result<Amount, Error>;
 
     /// Subscribes to notifications for activity on a specific *scriptPubKey*.
     ///
@@ -411,6 +411,8 @@ pub trait ElectrumApi {
 mod test {
     use std::{borrow::Cow, sync::Arc};
 
+    use bitcoin::Amount;
+
     use super::ElectrumApi;
 
     #[derive(Debug, Clone)]
@@ -453,7 +455,7 @@ mod test {
             unreachable!()
         }
 
-        fn relay_fee(&self) -> Result<f64, super::Error> {
+        fn relay_fee(&self) -> Result<Amount, super::Error> {
             unreachable!()
         }
 

src/client.rs

@@ -2,6 +2,7 @@
 
 use std::{borrow::Borrow, sync::RwLock};
 
+use bitcoin::Amount;
 use log::{info, warn};
 
 use bitcoin::{Script, Txid};
@@ -212,7 +213,7 @@ impl ElectrumApi for Client {
     }
 
     #[inline]
-    fn relay_fee(&self) -> Result<f64, Error> {
+    fn relay_fee(&self) -> Result<Amount, Error> {
         impl_inner_call!(self, relay_fee)
     }
 

src/raw_client.rs

@@ -17,7 +17,7 @@ use log::{debug, error, info, trace, warn};
 
 use bitcoin::consensus::encode::deserialize;
 use bitcoin::hex::{DisplayHex, FromHex};
-use bitcoin::{Script, Txid};
+use bitcoin::{Amount, Script, Txid};
 
 #[cfg(feature = "use-openssl")]
 use openssl::ssl::{SslConnector, SslMethod, SslStream, SslVerifyMode};
@@ -902,17 +902,19 @@ impl<T: Read + Write> ElectrumApi for RawClient<T> {
             .ok_or_else(|| Error::InvalidResponse(result.clone()))
     }
 
-    fn relay_fee(&self) -> Result<f64, Error> {
+    fn relay_fee(&self) -> Result<Amount, Error> {
         let req = Request::new_id(
             self.last_id.fetch_add(1, Ordering::SeqCst),
             "blockchain.relayfee",
             vec![],
         );
         let result = self.call(req)?;
 
-        result
+        let btc = result
             .as_f64()
-            .ok_or_else(|| Error::InvalidResponse(result.clone()))
+            .ok_or_else(|| Error::InvalidResponse(result.clone()))?;
+
+        Amount::from_btc(btc).map_err(|e| Error::Message(format!("{e}")))
     }
 
     fn script_subscribe(&self, script: &Script) -> Result<Option<ScriptStatus>, Error> {
@@ -1249,7 +1251,7 @@ mod test {
         let client = RawClient::new(get_test_server(), None).unwrap();
 
         let resp = client.relay_fee().unwrap();
-        assert_eq!(resp, 0.00001);
+        assert_eq!(resp.to_sat(), 100);
     }
 
     #[test]