cargo fix & cargo fmt

src/bin/cashierd.rs

@@ -34,7 +34,7 @@ async fn start(executor: Arc<Executor<'_>>, config: Arc<CashierdConfig>) -> Resu
     let wallet = Arc::new(CashierDb::new("cashier.db", config.password.clone())?);
 
     debug!(target: "Client", "Creating gateway client");
-    let mut gateway = GatewayClient::new(gateway_addr,"127.0.0.1:4444".parse()?, slabstore)?;
+    let mut gateway = GatewayClient::new(gateway_addr, "127.0.0.1:4444".parse()?, slabstore)?;
 
     gateway.start().await?;
 

src/client/client.rs

@@ -51,7 +51,7 @@ impl Client {
         let merkle_roots = RocksColumn::<columns::MerkleRoots>::new(rocks.clone());
         let nullifiers = RocksColumn::<columns::Nullifiers>::new(rocks);
 
-        // TODO: pass params paths to Client 
+        // TODO: pass params paths to Client
         // Auto create trusted ceremony parameters if they don't exist
         if !Path::new("mint.params").exists() {
             let params = setup_mint_prover();
@@ -100,7 +100,6 @@ impl Client {
         executor: Arc<Executor<'_>>,
         wallet: WalletPtr,
     ) -> Result<()> {
-
         if self.connected_with_cashier {
             warn!("The client already connected to the subscriber");
             return Ok(());
@@ -245,13 +244,13 @@ pub struct State {
     pub mint_pvk: groth16::PreparedVerifyingKey<Bls12>,
     // Spend verifying key used by ZK
     pub spend_pvk: groth16::PreparedVerifyingKey<Bls12>,
-    // TODO: remove this 
+    // TODO: remove this
     wallet_path: PathBuf,
 }
 
 impl ProgramState for State {
     fn is_valid_cashier_public_key(&self, _public: &jubjub::SubgroupPoint) -> bool {
-        // TODO: use walletdb instead of connecting with sqlite directly 
+        // TODO: use walletdb instead of connecting with sqlite directly
         let conn =
             Connection::open(self.wallet_path.clone()).expect("Failed to connect to database");
         let mut stmt = conn

src/client/mod.rs

@@ -1,5 +1,3 @@
-
 pub mod client;
 
-pub use client::{State, Client};
-
+pub use client::{Client, State};

src/lib.rs

@@ -9,6 +9,7 @@ pub mod blockchain;
 pub mod bls_extensions;
 pub mod circuit;
 pub mod cli;
+pub mod client;
 pub mod crypto;
 pub mod endian;
 pub mod error;
@@ -23,7 +24,6 @@ pub mod util;
 pub mod vm;
 pub mod vm_serial;
 pub mod wallet;
-pub mod client;
 
 pub use crate::bls_extensions::BlsStringConversion;
 pub use crate::error::{Error, Result};

src/rpc/jsonserver.rs

@@ -87,7 +87,6 @@ pub async fn start(
         io,
     );
 
-
     executor.spawn(http).detach();
 
     *rpc.started.lock().await = true;
@@ -130,7 +129,7 @@ impl RpcInterface {
         let mut res = Response::new(StatusCode::Ok);
         res.insert_header("Content-Type", "text/plain");
         res.set_body(response);
-        
+
         Ok(res)
     }
 

src/service/btc.rs

@@ -81,14 +81,14 @@ impl BitcoinKeys {
 
     async fn subscribe_status_loop(
         self: Arc<Self>,
-        status_start: Option<electrum_client::ScriptStatus>,
-        executor: Arc<Executor<'_>>,
+        _status_start: Option<electrum_client::ScriptStatus>,
+        _executor: Arc<Executor<'_>>,
     ) -> Result<Option<String>> {
         loop {
             let check = self.btc_client.script_pop(&self.script);
             match check {
                 // Script has a notification update
-                Ok(status) => {}
+                Ok(_status) => {}
                 // No update, repeat
                 Err(_) => break,
             }

src/service/cashier.rs

@@ -14,8 +14,8 @@ use ff::Field;
 use rand::rngs::OsRng;
 
 use async_executor::Executor;
-use bitcoin::blockdata::script::Script;
-use electrum_client::{Client as ElectrumClient, ElectrumApi};
+
+use electrum_client::Client as ElectrumClient;
 use log::*;
 
 use async_std::sync::Arc;
@@ -57,7 +57,7 @@ impl CashierService {
         let client_address = btc_endpoint;
 
         // create client
-        let mut btc_client = Arc::new(ElectrumClient::new(&client_address)?);
+        let btc_client = Arc::new(ElectrumClient::new(&client_address)?);
 
         let (mint_params, mint_pvk) = load_params("mint.params")?;
         let (spend_params, spend_pvk) = load_params("spend.params")?;
@@ -170,7 +170,7 @@ impl CashierService {
                 let zkpub = request.get_payload();
 
                 //check if key has already been issued
-                let check = cashier_wallet.get_keys_by_dkey(&zkpub);
+                let _check = cashier_wallet.get_keys_by_dkey(&zkpub);
 
                 // Generate bitcoin Address
                 let btc_keys = BitcoinKeys::new(btc_client).unwrap();
@@ -178,10 +178,10 @@ impl CashierService {
                 let btc_pub = btc_keys.get_pubkey();
                 let btc_priv = btc_keys.get_privkey();
 
-                let script = btc_keys.get_script();
+                let _script = btc_keys.get_script();
 
                 // add pairings to db
-                let result = cashier_wallet.put_exchange_keys(zkpub, *btc_priv, *btc_pub);
+                let _result = cashier_wallet.put_exchange_keys(zkpub, *btc_priv, *btc_pub);
 
                 let mut reply = Reply::from(&request, CashierError::NoError as u32, vec![]);
 

src/service/gateway.rs

@@ -186,7 +186,11 @@ pub struct GatewayClient {
 }
 
 impl GatewayClient {
-    pub fn new(addr: SocketAddr, sub_addr: SocketAddr, rocks: RocksColumn<columns::Slabs>) -> Result<Self> {
+    pub fn new(
+        addr: SocketAddr,
+        sub_addr: SocketAddr,
+        rocks: RocksColumn<columns::Slabs>,
+    ) -> Result<Self> {
         let protocol = ReqProtocol::new(addr, String::from("GATEWAY CLIENT"));
 
         let slabstore = SlabStore::new(rocks)?;