Use Amount type for balance

Author: Conor Okus

examples/bitcoind-rpc-client/src/bitcoind_client.rs

@@ -1,4 +1,4 @@
-use std::{sync::{Arc}, io::{Result, Error, ErrorKind}};
+use std::{sync::{Arc}, io};
 
 use bitcoin::{BlockHash, Block};
 use lightning_block_sync::{rpc::RpcClient, http::{HttpEndpoint}, BlockSource, AsyncBlockSourceResult, BlockHeaderData};
@@ -44,7 +44,7 @@ impl BlockSource for &BitcoindClient {
 }
 
 impl BitcoindClient {
-    pub async fn new(host: String, port: u16, rpc_user: String, rpc_password: String) -> Result<Self> {
+    pub async fn new(host: String, port: u16, rpc_user: String, rpc_password: String) -> io::Result<Self> {
         let http_endpoint = HttpEndpoint::for_host(host.clone()).with_port(port);
         let rpc_creditials = 
             base64::encode(format!("{}:{}", rpc_user.clone(), rpc_password.clone()));
@@ -53,7 +53,7 @@ impl BitcoindClient {
 			.call_method::<BlockchainInfoResponse>("getblockchaininfo", &vec![])
 			.await
 			.map_err(|_| {
-				Error::new(ErrorKind::PermissionDenied,
+				io::Error::new(io::ErrorKind::PermissionDenied,
 				"Failed to make initial call to bitcoind - please check your RPC user/password and access settings")
 			})?;
 
@@ -68,7 +68,7 @@ impl BitcoindClient {
         Ok(client)
     }
 
-    pub fn get_new_rpc_client(&self) -> Result<RpcClient> {
+    pub fn get_new_rpc_client(&self) -> io::Result<RpcClient> {
 		let http_endpoint = HttpEndpoint::for_host(self.host.clone()).with_port(self.port);
 		let rpc_credentials =
 			base64::encode(format!("{}:{}", self.rpc_user.clone(), self.rpc_password.clone()));

examples/bitcoind-rpc-client/src/convert.rs

@@ -1,6 +1,6 @@
 use std::convert::TryInto;
 
-use bitcoin::{BlockHash, hashes::hex::FromHex};
+use bitcoin::{Amount, BlockHash, hashes::hex::FromHex};
 use lightning_block_sync::http::JsonResponse;
 
 /// TryInto implementation specifies the conversion logic from json response to BlockchainInfo object.
@@ -36,12 +36,13 @@ impl TryInto<CreateWalletResponse> for JsonResponse {
         })
     }
 }
-pub struct GetBalanceResponse(pub usize);
+pub struct GetBalanceResponse(pub Amount);
 
 impl TryInto<GetBalanceResponse> for JsonResponse {
     type Error = std::io::Error;
     fn try_into(self) -> std::io::Result<GetBalanceResponse> {
-        Ok(GetBalanceResponse(self.0.as_f64().unwrap() as usize))
+        let balance = Amount::from_btc(self.0.as_f64().unwrap()).unwrap();
+        Ok(GetBalanceResponse(balance))
     }
 }