Improve readability

Author: Conor Okus

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

@@ -2,6 +2,7 @@ use std::{sync::{Arc}};
 
 use bitcoin::{BlockHash, Block};
 use lightning_block_sync::{rpc::RpcClient, http::{HttpEndpoint}, BlockSource, AsyncBlockSourceResult, BlockHeaderData};
+use serde_json::json;
 use tokio::sync::Mutex;
 
 use crate::convert::{CreateWalletResponse, BlockchainInfoResponse, NewAddressResponse, GetBalanceResponse, GenerateToAddressResponse};
@@ -48,7 +49,7 @@ impl BitcoindClient {
         let rpc_creditials = 
             base64::encode(format!("{}:{}", rpc_user.clone(), rpc_password.clone()));
         let mut bitcoind_rpc_client = RpcClient::new(&rpc_creditials, http_endpoint)?;
-        let _dummy = bitcoind_rpc_client
+        bitcoind_rpc_client
 			.call_method::<BlockchainInfoResponse>("getblockchaininfo", &vec![])
 			.await
 			.map_err(|_| {
@@ -81,15 +82,15 @@ impl BitcoindClient {
 
     pub async fn create_wallet(&self) -> CreateWalletResponse {
         let mut rpc = self.bitcoind_rpc_client.lock().await;
-        let create_wallet_args = vec![serde_json::json!("test-wallet")];
+        let create_wallet_args = vec![json!("test-wallet")];
 
         rpc.call_method::<CreateWalletResponse>("createwallet", &create_wallet_args).await.unwrap()
     }
 
     pub async fn get_new_address(&self) -> String {
 		let mut rpc = self.bitcoind_rpc_client.lock().await;
 
-		let addr_args = vec![serde_json::json!("LDK output address")];
+		let addr_args = vec![json!("LDK output address")];
 		let addr = rpc.call_method::<NewAddressResponse>("getnewaddress", &addr_args).await.unwrap();
 		addr.0.to_string()
 	}
@@ -103,16 +104,9 @@ impl BitcoindClient {
     pub async fn generate_to_address(&self, block_num: u64, address: &str) -> GenerateToAddressResponse {
 		let mut rpc = self.bitcoind_rpc_client.lock().await;
 
-		let generate_to_address_args = vec![serde_json::json!(block_num), serde_json::json!(address)];
+		let generate_to_address_args = vec![json!(block_num), json!(address)];
 
 
 		rpc.call_method::<GenerateToAddressResponse>("generatetoaddress", &generate_to_address_args).await.unwrap()
 	}
-}
-
-
-
-
-
-
-
+}

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

@@ -3,7 +3,7 @@ use std::convert::TryInto;
 use bitcoin::{BlockHash, hashes::hex::FromHex};
 use lightning_block_sync::http::JsonResponse;
 
-// TryInto implementation specifies the conversion logic from json response to BlockchainInfo object.
+/// TryInto implementation specifies the conversion logic from json response to BlockchainInfo object.
 pub struct BlockchainInfoResponse {
     pub latest_height: usize,
     pub latest_blockhash: BlockHash,
@@ -54,7 +54,7 @@ impl TryInto<GenerateToAddressResponse> for JsonResponse {
 
         for item in self.0.as_array().unwrap() {
             x.push(BlockHash::from_hex(item.as_str().unwrap())
-            .unwrap());
+                .unwrap());
         }
 
         Ok(GenerateToAddressResponse(x))
@@ -69,13 +69,4 @@ impl TryInto<NewAddressResponse> for JsonResponse {
     fn try_into(self) -> std::io::Result<NewAddressResponse> {
         Ok(NewAddressResponse(self.0.as_str().unwrap().to_string()))
     }
-}
-
-
-
-
-
-
-
-
-
+}

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

@@ -50,4 +50,4 @@ async fn start_ldk() {
     // Show balance
     let balance = bitcoind_client.get_balance().await;
     println!("Balance: {}", balance.0);
-}
+}