From 043bb61f780d26cb715c8403eefa2fc181163184 Mon Sep 17 00:00:00 2001
From: ghassmo <ghxxm@protonmail.com>
Date: Sun, 17 Oct 2021 08:40:26 +0300
Subject: [PATCH] clean up

---
 src/client.rs            | 2 +-
 src/rpc/rpcserver.rs     | 2 +-
 src/service/btc.rs       | 2 +-
 src/service/sol.rs       | 4 ++--
 src/wallet/cashierdb.rs  | 4 ++--
 src/wallet/wallet_api.rs | 2 +-
 src/wallet/walletdb.rs   | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/client.rs b/src/client.rs
index d97b42f98..73d8a8309 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -381,7 +381,7 @@ pub struct State {
 impl ProgramState for State {
     fn is_valid_cashier_public_key(&self, public: &jubjub::SubgroupPoint) -> bool {
         debug!(target: "CLIENT STATE", "Check if it is valid cashier public key");
-        return self.public_keys.contains(public);
+        self.public_keys.contains(public)
     }
 
     fn is_valid_merkle(&self, merkle_root: &MerkleNode) -> bool {
diff --git a/src/rpc/rpcserver.rs b/src/rpc/rpcserver.rs
index f30eb8320..230688f8b 100644
--- a/src/rpc/rpcserver.rs
+++ b/src/rpc/rpcserver.rs
@@ -103,7 +103,7 @@ async fn serve(
             },
             Err(e) => {
                 debug!(target: "RPC SERVER", "Failed to establish TLS connection: {:#}", e);
-                return Ok(());
+                Ok(())
             }
         },
     }
diff --git a/src/service/btc.rs b/src/service/btc.rs
index 2bb324970..df0505932 100644
--- a/src/service/btc.rs
+++ b/src/service/btc.rs
@@ -312,7 +312,7 @@ impl BtcClient {
             input: inputs,
             output: vec![TxOut {
                 script_pubkey: main_script_pubkey,
-                value: value,
+                value,
             }],
             lock_time: 0,
             version: 2,
diff --git a/src/service/sol.rs b/src/service/sol.rs
index dffa16dc1..9a143c773 100644
--- a/src/service/sol.rs
+++ b/src/service/sol.rs
@@ -219,8 +219,9 @@ impl SolClient {
             ));
         }
 
+        let amnt = cur_balance - prev_balance;
+
         if mint.is_some() {
-            let amnt = cur_balance - prev_balance;
             let ui_amnt = amnt / u64::pow(10, decimals as u32);
 
             send_notification
@@ -237,7 +238,6 @@ impl SolClient {
             debug!(target: "SOL BRIDGE", "Received {} {:?} tokens", ui_amnt, mint.unwrap());
             let _ = self.send_tok_to_main_wallet(&rpc, &mint.unwrap(), amnt, decimals, &keypair)?;
         } else {
-            let amnt = cur_balance - prev_balance;
             let ui_amnt = lamports_to_sol(amnt);
 
             send_notification
diff --git a/src/wallet/cashierdb.rs b/src/wallet/cashierdb.rs
index 1be7e9374..28923ece6 100644
--- a/src/wallet/cashierdb.rs
+++ b/src/wallet/cashierdb.rs
@@ -63,7 +63,7 @@ impl CashierDb {
                 let conn = Connection::open(&self.path)?;
                 debug!(target: "CASHIERDB", "Opened connection at path {:?}", self.path);
                 conn.pragma_update(None, "key", &self.password)?;
-                conn.execute_batch(&contents)?;
+                conn.execute_batch(contents)?;
                 *self.initialized.lock().await = true;
             } else {
                 debug!(
@@ -264,7 +264,7 @@ impl CashierDb {
             WHERE d_key_public = :d_key_public AND confirm = :confirm;",
         )?;
         let addr_iter = stmt.query_map(
-            &[(":d_key_public", &d_key_public), (":confirm", &&confirm)],
+            &[(":d_key_public", &d_key_public), (":confirm", &confirm)],
             |row| Ok((row.get(0)?, row.get(1)?, row.get(2)?, row.get(3)?)),
         )?;
 
diff --git a/src/wallet/wallet_api.rs b/src/wallet/wallet_api.rs
index ff3cd5e27..5dfb6250f 100644
--- a/src/wallet/wallet_api.rs
+++ b/src/wallet/wallet_api.rs
@@ -13,7 +13,7 @@ pub trait WalletApi {
     }
 
     fn get_value_deserialized<D: Decodable>(&self, key: &Vec<u8>) -> Result<D> {
-        let v: D = deserialize(&key)?;
+        let v: D = deserialize(key)?;
         Ok(v)
     }
 }
diff --git a/src/wallet/walletdb.rs b/src/wallet/walletdb.rs
index 5933ad80a..288cdcba0 100644
--- a/src/wallet/walletdb.rs
+++ b/src/wallet/walletdb.rs
@@ -80,7 +80,7 @@ impl WalletDb {
                 let conn = Connection::open(&self.path)?;
                 debug!(target: "WALLETDB", "OPENED CONNECTION AT PATH {:?}", self.path);
                 conn.pragma_update(None, "key", &self.password)?;
-                conn.execute_batch(&contents)?;
+                conn.execute_batch(contents)?;
                 *self.initialized.lock().await = true;
             } else {
                 debug!(