Use shorthand for errors and fmt

src/bin/cashierd.rs

@@ -26,7 +26,7 @@ async fn start(executor: Arc<Executor<'_>>, config: Arc<CashierdConfig>) -> Resu
 
     let wallet = Arc::new(CashierDb::new("cashier.db", config.password.clone())?);
 
-    // TODO add to config 
+    // TODO add to config
     let client_wallet_path = "cashier_client_wallet.db";
 
     debug!(target: "cashierd", "starting cashier service");
@@ -41,7 +41,8 @@ async fn start(executor: Arc<Executor<'_>>, config: Arc<CashierdConfig>) -> Resu
             PathBuf::from("cashier_spend.params"),
         ),
         PathBuf::from(client_wallet_path),
-    ).await?;
+    )
+    .await?;
 
     cashier.start(ex.clone()).await?;
 

src/client/mod.rs

@@ -25,19 +25,15 @@ impl fmt::Display for ClientFailed {
             }
             ClientFailed::UnvalidAddress(i) => {
                 write!(f, "Unvalid Address {}", i)
-            }            
+            }
             ClientFailed::UnvalidAmount(i) => {
                 write!(f, "Unvalid Amount {}", i)
             }
-            ClientFailed::UnableToGetDepositAddress => {
-                f.write_str("Unable to get deposit address")
-            }
+            ClientFailed::UnableToGetDepositAddress => f.write_str("Unable to get deposit address"),
             ClientFailed::UnableToGetWithdrawAddress => {
                 f.write_str("Unable to get withdraw address")
             }
-            ClientFailed::EmptyPassword => {
-                f.write_str("Password is empty. Cannot create database")
-            }
+            ClientFailed::EmptyPassword => f.write_str("Password is empty. Cannot create database"),
             ClientFailed::ClientError(i) => {
                 write!(f, "ClientError: {}", i)
             }

src/error.rs

@@ -1,8 +1,8 @@
 use jsonrpc_core::*;
 use std::fmt;
 
-use crate::state;
 use crate::client;
+use crate::state;
 use crate::vm::ZkVmError;
 
 pub type Result<T> = std::result::Result<T, Error>;

src/service/btc.rs

@@ -11,7 +11,6 @@ use electrum_client::{Client as ElectrumClient, ElectrumApi, GetBalanceRes};
 use log::*;
 use secp256k1::key::SecretKey;
 
-
 // Swap out these types for any future non bitcoin-rs types
 pub type PubAddress = Address;
 pub type PubKey = PublicKey;
@@ -71,28 +70,27 @@ impl BitcoinKeys {
         // Check if script is already subscribed
         if let Some(status_start) = client.script_subscribe(&self.script)? {
             loop {
-                match client.script_pop(&self.script)?
-                {
+                match client.script_pop(&self.script)? {
                     Some(status) => {
                         // Script has a notification update
                         if status != status_start {
                             let balance = client.script_get_balance(&self.script)?;
                             if balance.confirmed > 0 {
                                 debug!(target: "deposit", "BTC Balance: Confirmed!");
-                                return Ok(Some(balance))
+                                return Ok(Some(balance));
                             } else {
                                 debug!(target: "deposit", "BTC Balance: Unconfirmed!");
-                                continue
+                                continue;
                             }
                         } else {
                             debug!(target: "deposit", "ScriptPubKey status has not changed");
-                            continue
+                            continue;
                         }
                     }
                     None => {
                         debug!(target: "deposit", "Scriptpubkey does not yet exist in script notifications!");
-                        continue
-                    },
+                        continue;
+                    }
                 };
             } // Endloop
         } else {

src/service/cashier.rs

@@ -95,7 +95,6 @@ impl CashierService {
         Ok(())
     }
 
-
     //async fn mint_dbtc(&mut self, dkey_pub: jubjub::SubgroupPoint, value: u64) -> Result<()> {
     //    let cashier_secret = self.wallet.get_cashier_private().unwrap();
 
@@ -177,7 +176,7 @@ impl CashierService {
                 let _check = cashier_wallet.get_keys_by_dkey(&zkpub);
 
                 // Generate bitcoin Address
-                let btc_keys = BitcoinKeys::new(btc_client).unwrap();
+                let btc_keys = BitcoinKeys::new(btc_client)?;
 
                 let btc_pub = btc_keys.get_pubkey();
                 let btc_priv = btc_keys.get_privkey();

src/util.rs

@@ -17,4 +17,3 @@ pub fn join_config_path(file: &PathBuf) -> Result<PathBuf> {
 
     Ok(path)
 }
-

src/wallet/cashierdb.rs

@@ -1,9 +1,9 @@
+use crate::client::ClientFailed;
 use crate::serial;
 use crate::serial::{deserialize, serialize, Decodable, Encodable};
 use crate::service::btc::{PrivKey, PubKey};
 use crate::util::join_config_path;
 use crate::{Error, Result};
-use crate::client::ClientFailed;
 
 use async_std::sync::Arc;
 use ff::Field;

src/wallet/walletdb.rs

@@ -1,10 +1,10 @@
+use crate::client::ClientFailed;
 use crate::crypto::{
     coin::Coin, merkle::IncrementalWitness, merkle_node::MerkleNode, note::Note, OwnCoins,
 };
 use crate::serial;
 use crate::serial::{deserialize, serialize, Decodable, Encodable};
 use crate::{Error, Result};
-use crate::client::ClientFailed;
 
 use async_std::sync::{Arc, Mutex};
 use ff::Field;