clean up by running cargo clippy

src/bin/darkfid.rs

@@ -176,15 +176,14 @@ impl Darkfid {
             let mut symbols: HashMap<String, (String, String)> = HashMap::new();
 
             for balance in balances.list.iter() {
+                let amount = encode_base10(BigUint::from(balance.value), 8);
                 if let Some((network, symbol)) =
                     self.drk_tokenlist.symbol_from_id(&balance.token_id)?
                 {
-                    let amount = encode_base10(BigUint::from(balance.value), 8);
                     symbols.insert(symbol, (amount, network.to_string()));
                 } else {
                     // TODO: SQL needs to have the mint address for show, not the internal hash.
                     // TODO: SQL needs to have the network name
-                    let amount = encode_base10(BigUint::from(balance.value), 8);
                     symbols.insert(
                         balance.token_id.to_string(),
                         (amount, String::from("UNKNOWN")),
@@ -239,7 +238,7 @@ impl Darkfid {
                     if let Some(tkn) = self.sol_tokenlist.search_id(symbol)? {
                         Ok(json!(tkn))
                     } else {
-                        return Err(Error::NotSupportedToken);
+                        Err(Error::NotSupportedToken)
                     }
                 }
                 #[cfg(feature = "btc")]
@@ -254,12 +253,10 @@ impl Darkfid {
                     let token_id: String = if symbol.to_lowercase() == "eth" {
                         use drk::service::eth::ETH_NATIVE_TOKEN_ID;
                         ETH_NATIVE_TOKEN_ID.to_string()
+                    } else if let Some(tkn) = self.eth_tokenlist.search_id(symbol)? {
+                        tkn
                     } else {
-                        if let Some(tkn) = self.eth_tokenlist.search_id(symbol)? {
-                            tkn
-                        } else {
-                            return Err(Error::NotSupportedToken);
-                        }
+                        return Err(Error::NotSupportedToken);
                     };
 
                     Ok(json!(token_id))

src/bin/drk.rs

@@ -33,8 +33,7 @@ impl Drk {
             && features.as_object().unwrap()["networks"]
                 .as_array()
                 .unwrap()
-                .len()
-                == 0
+                .is_empty()
         {
             return Err(Error::NotSupportedNetwork);
         }

src/client.rs

@@ -70,7 +70,7 @@ impl Client {
             bs58::encode(&serialize(&main_keypair.public)).into_string()
         );
 
-        let slabstore = RocksColumn::<columns::Slabs>::new(rocks.clone());
+        let slabstore = RocksColumn::<columns::Slabs>::new(rocks);
 
         // create gateway client
         debug!(target: "CLIENT", "Creating GatewayClient");

src/service/btc.rs

@@ -229,7 +229,7 @@ impl Client {
         let config = bdk::electrum_client::ConfigBuilder::default()
             .retry(5)
             .build();
-        let client = ElectrumClient::from_config(electrum_url, config)?;
+        let _client = ElectrumClient::from_config(electrum_url, config)?;
 
         let electrum = ElectrumClient::new(electrum_url)
             .map_err(|err| crate::Error::from(super::BtcFailed::from(err)))?;
@@ -263,8 +263,7 @@ impl Client {
     }
     fn update_latest_block(&mut self) -> BtcResult<()> {
         let latest_block = self.electrum.block_headers_subscribe()?;
-        let latest_block_height = BlockHeight::try_from(latest_block)
-            .map_err(|err| crate::Error::from(super::BtcFailed::from(err)))?;
+        let latest_block_height = BlockHeight::try_from(latest_block)?;
 
         if latest_block_height > self.latest_block_height {
             debug!( target: "BTC BRIDGE", "{} {}",
@@ -304,7 +303,7 @@ impl Client {
         }
         self.update_state()?;
 
-        let history = self.script_history.entry(script.clone()).or_default();
+        let history = self.script_history.entry(script).or_default();
 
         match history.as_slice() {
             [] => Ok(ScriptStatus::Unseen),
@@ -598,7 +597,7 @@ impl NetworkClient for BtcClient {
         let main_script_pubkey = &self.main_account.script_pubkey;
 
         let main_utxo = electrum
-            .script_list_unspent(&main_script_pubkey)
+            .script_list_unspent(main_script_pubkey)
             .map_err(|e| Error::from(BtcFailed::from(e)))?;
 
         let transaction = Transaction {

src/service/eth.rs

@@ -297,7 +297,7 @@ impl EthClient {
         Ok(())
     }
 
-    async fn unsubscribe(&self, pubkey: &String) {
+    async fn unsubscribe(&self, pubkey: &str) {
         let mut subscriptions = self.subscriptions.lock().await;
         let index = subscriptions.iter().position(|p| p == pubkey);
         if let Some(ind) = index {
@@ -376,7 +376,7 @@ impl EthClient {
         let block = block.as_str().unwrap();
 
         // Native ETH balance
-        let hexbalance = self.get_eth_balance(&acc, block).await?;
+        let hexbalance = self.get_eth_balance(acc, block).await?;
         let hexbalance = hexbalance.as_str().unwrap().trim_start_matches("0x");
         let balance = BigUint::parse_bytes(hexbalance.as_bytes(), 16).unwrap();
 

src/util/address.rs

@@ -23,10 +23,7 @@ impl std::fmt::Display for Address {
         hasher.update(self.hash);
         let mut hash = hasher.finalize().to_vec();
 
-        let mut payload = vec![];
-
-        // add version
-        payload.push(0x00 as u8);
+        let mut payload: Vec<u8> = vec![0x00_u8];
 
         // add public key hash
         payload.append(&mut hash);

src/util/token_list.rs

@@ -68,14 +68,14 @@ impl DrkTokenList {
         let sol_tokens: HashMap<String, jubjub::Fr> = sol_symbols
             .iter()
             .filter_map(|symbol| {
-                Self::generate_hash_pair(&sol_list, &NetworkName::Solana, symbol).ok()
+                Self::generate_hash_pair(sol_list, &NetworkName::Solana, symbol).ok()
             })
             .collect();
 
         let eth_tokens: HashMap<String, jubjub::Fr> = eth_symbols
             .iter()
             .filter_map(|symbol| {
-                Self::generate_hash_pair(&eth_list, &NetworkName::Ethereum, symbol).ok()
+                Self::generate_hash_pair(eth_list, &NetworkName::Ethereum, symbol).ok()
             })
             .collect();