chore: Clippy lints

bin/darkfi-mmproxy/src/main.rs

@@ -137,12 +137,12 @@ impl MiningProxy {
             _ => unimplemented!("Missing handler for network {}", nettype),
         }
 
-        if xmr_is_mainnet && !(monero_network == monero::Network::Mainnet) {
+        if xmr_is_mainnet && monero_network != monero::Network::Mainnet {
             error!("mmproxy requested testnet, but monerod is mainnet");
             return Err(Error::Custom("Monero network mismatch".to_string()))
         }
 
-        if xmr_is_testnet && !(monero_network == monero::Network::Testnet) {
+        if xmr_is_testnet && monero_network != monero::Network::Testnet {
             error!("mmproxy requested mainnet, but monerod is testnet");
             return Err(Error::Custom("Monero network mismatch".to_string()))
         }

bin/tau/taud/src/month_tasks.rs

@@ -238,10 +238,7 @@ impl MonthTasks {
 
 #[cfg(test)]
 mod tests {
-    use std::{
-        fs::{create_dir_all, remove_dir_all},
-        path::PathBuf,
-    };
+    use std::fs::{create_dir_all, remove_dir_all};
 
     use super::*;
     use darkfi::Result;

src/contract/test-harness/src/dao_exec.rs

@@ -63,20 +63,15 @@ impl TestHarness {
     ) -> Result<(Transaction, MoneyTransferParamsV1, DaoExecParams, Option<MoneyFeeParamsV1>)> {
         let dao_wallet = self.holders.get(&Holder::Dao).unwrap();
 
-        let (mint_pk, mint_zkbin) =
-            self.proving_keys.get(&MONEY_CONTRACT_ZKAS_MINT_NS_V1.to_string()).unwrap();
-        let (burn_pk, burn_zkbin) =
-            self.proving_keys.get(&MONEY_CONTRACT_ZKAS_BURN_NS_V1.to_string()).unwrap();
+        let (mint_pk, mint_zkbin) = self.proving_keys.get(MONEY_CONTRACT_ZKAS_MINT_NS_V1).unwrap();
+        let (burn_pk, burn_zkbin) = self.proving_keys.get(MONEY_CONTRACT_ZKAS_BURN_NS_V1).unwrap();
+
         let (dao_exec_pk, dao_exec_zkbin) =
-            self.proving_keys.get(&DAO_CONTRACT_ZKAS_DAO_EXEC_NS.to_string()).unwrap();
-        let (dao_auth_xfer_pk, dao_auth_xfer_zkbin) = self
-            .proving_keys
-            .get(&DAO_CONTRACT_ZKAS_DAO_AUTH_MONEY_TRANSFER_NS.to_string())
-            .unwrap();
-        let (dao_auth_xfer_enc_coin_pk, dao_auth_xfer_enc_coin_zkbin) = self
-            .proving_keys
-            .get(&DAO_CONTRACT_ZKAS_DAO_AUTH_MONEY_TRANSFER_ENC_COIN_NS.to_string())
-            .unwrap();
+            self.proving_keys.get(DAO_CONTRACT_ZKAS_DAO_EXEC_NS).unwrap();
+        let (dao_auth_xfer_pk, dao_auth_xfer_zkbin) =
+            self.proving_keys.get(DAO_CONTRACT_ZKAS_DAO_AUTH_MONEY_TRANSFER_NS).unwrap();
+        let (dao_auth_xfer_enc_coin_pk, dao_auth_xfer_enc_coin_zkbin) =
+            self.proving_keys.get(DAO_CONTRACT_ZKAS_DAO_AUTH_MONEY_TRANSFER_ENC_COIN_NS).unwrap();
 
         let input_user_data_blind = Blind::random(&mut OsRng);
         let exec_signature_secret = SecretKey::random(&mut OsRng);

src/contract/test-harness/src/dao_mint.rs

@@ -51,7 +51,7 @@ impl TestHarness {
         block_height: u64,
     ) -> Result<(Transaction, DaoMintParams, Option<MoneyFeeParamsV1>)> {
         let (dao_mint_pk, dao_mint_zkbin) =
-            self.proving_keys.get(&DAO_CONTRACT_ZKAS_DAO_MINT_NS.to_string()).unwrap();
+            self.proving_keys.get(DAO_CONTRACT_ZKAS_DAO_MINT_NS).unwrap();
 
         // Create the call
         let (params, proofs) =

src/contract/test-harness/src/dao_propose.rs

@@ -59,10 +59,10 @@ impl TestHarness {
         let wallet = self.holders.get(proposer).unwrap();
 
         let (dao_propose_burn_pk, dao_propose_burn_zkbin) =
-            self.proving_keys.get(&DAO_CONTRACT_ZKAS_DAO_PROPOSE_INPUT_NS.to_string()).unwrap();
+            self.proving_keys.get(DAO_CONTRACT_ZKAS_DAO_PROPOSE_INPUT_NS).unwrap();
 
         let (dao_propose_main_pk, dao_propose_main_zkbin) =
-            self.proving_keys.get(&DAO_CONTRACT_ZKAS_DAO_PROPOSE_MAIN_NS.to_string()).unwrap();
+            self.proving_keys.get(DAO_CONTRACT_ZKAS_DAO_PROPOSE_MAIN_NS).unwrap();
 
         let propose_owncoin: OwnCoin = wallet
             .unspent_money_coins

src/contract/test-harness/src/dao_vote.rs

@@ -56,10 +56,10 @@ impl TestHarness {
         let wallet = self.holders.get(voter).unwrap();
 
         let (dao_vote_burn_pk, dao_vote_burn_zkbin) =
-            self.proving_keys.get(&DAO_CONTRACT_ZKAS_DAO_VOTE_INPUT_NS.to_string()).unwrap();
+            self.proving_keys.get(DAO_CONTRACT_ZKAS_DAO_VOTE_INPUT_NS).unwrap();
 
         let (dao_vote_main_pk, dao_vote_main_zkbin) =
-            self.proving_keys.get(&DAO_CONTRACT_ZKAS_DAO_VOTE_MAIN_NS.to_string()).unwrap();
+            self.proving_keys.get(DAO_CONTRACT_ZKAS_DAO_VOTE_MAIN_NS).unwrap();
 
         let (_proposal_leaf_pos, snapshot_money_merkle_tree) =
             wallet.dao_prop_leafs.get(proposal_bulla).unwrap();

src/contract/test-harness/src/money_fee.rs

@@ -89,8 +89,7 @@ impl TestHarness {
         let signature_secret = SecretKey::random(&mut OsRng);
 
         info!("Creting FeeV1 ZK proof");
-        let (fee_pk, fee_zkbin) =
-            self.proving_keys.get(&MONEY_CONTRACT_ZKAS_FEE_NS_V1.to_string()).unwrap();
+        let (fee_pk, fee_zkbin) = self.proving_keys.get(MONEY_CONTRACT_ZKAS_FEE_NS_V1).unwrap();
 
         let (proof, public_inputs) = create_fee_proof(
             fee_zkbin,
@@ -252,8 +251,7 @@ impl TestHarness {
         let signature_secret = SecretKey::random(&mut OsRng);
 
         info!("Creating FeeV1 ZK proof");
-        let (fee_pk, fee_zkbin) =
-            self.proving_keys.get(&MONEY_CONTRACT_ZKAS_FEE_NS_V1.to_string()).unwrap();
+        let (fee_pk, fee_zkbin) = self.proving_keys.get(MONEY_CONTRACT_ZKAS_FEE_NS_V1).unwrap();
 
         let (proof, public_inputs) = create_fee_proof(
             fee_zkbin,

src/contract/test-harness/src/money_genesis_mint.rs

@@ -49,8 +49,7 @@ impl TestHarness {
     ) -> Result<(Transaction, MoneyGenesisMintParamsV1)> {
         let wallet = self.holders.get(holder).unwrap();
 
-        let (mint_pk, mint_zkbin) =
-            self.proving_keys.get(&MONEY_CONTRACT_ZKAS_MINT_NS_V1.to_string()).unwrap();
+        let (mint_pk, mint_zkbin) = self.proving_keys.get(MONEY_CONTRACT_ZKAS_MINT_NS_V1).unwrap();
 
         // Build the contract call
         let builder = GenesisMintCallBuilder {

src/contract/test-harness/src/money_otc_swap.rs

@@ -52,11 +52,8 @@ impl TestHarness {
         let wallet0 = self.holders.get(holder0).unwrap();
         let wallet1 = self.holders.get(holder1).unwrap();
 
-        let (mint_pk, mint_zkbin) =
-            self.proving_keys.get(&MONEY_CONTRACT_ZKAS_MINT_NS_V1.to_string()).unwrap();
-
-        let (burn_pk, burn_zkbin) =
-            self.proving_keys.get(&MONEY_CONTRACT_ZKAS_BURN_NS_V1.to_string()).unwrap();
+        let (mint_pk, mint_zkbin) = self.proving_keys.get(MONEY_CONTRACT_ZKAS_MINT_NS_V1).unwrap();
+        let (burn_pk, burn_zkbin) = self.proving_keys.get(MONEY_CONTRACT_ZKAS_BURN_NS_V1).unwrap();
 
         // Use a zero spend_hook and user_data
         let rcpt_spend_hook = FuncId::none();

src/contract/test-harness/src/money_pow_reward.rs

@@ -50,8 +50,7 @@ impl TestHarness {
     ) -> Result<(Transaction, MoneyPoWRewardParamsV1)> {
         let wallet = self.holders.get(holder).unwrap();
 
-        let (mint_pk, mint_zkbin) =
-            self.proving_keys.get(&MONEY_CONTRACT_ZKAS_MINT_NS_V1.to_string()).unwrap();
+        let (mint_pk, mint_zkbin) = self.proving_keys.get(MONEY_CONTRACT_ZKAS_MINT_NS_V1).unwrap();
 
         // Reference the last block in the holder's blockchain
         let last_block = wallet.validator.blockchain.last_block()?;

src/contract/test-harness/src/money_token.rs

@@ -68,10 +68,10 @@ impl TestHarness {
         let rcpt = self.holders.get(recipient).unwrap().keypair.public;
 
         let (token_mint_pk, token_mint_zkbin) =
-            self.proving_keys.get(&MONEY_CONTRACT_ZKAS_TOKEN_MINT_NS_V1.to_string()).unwrap();
+            self.proving_keys.get(MONEY_CONTRACT_ZKAS_TOKEN_MINT_NS_V1).unwrap();
 
         let (auth_mint_pk, auth_mint_zkbin) =
-            self.proving_keys.get(&MONEY_CONTRACT_ZKAS_AUTH_TOKEN_MINT_NS_V1.to_string()).unwrap();
+            self.proving_keys.get(MONEY_CONTRACT_ZKAS_AUTH_TOKEN_MINT_NS_V1).unwrap();
 
         // Create the Auth FuncID
         let auth_func_id = FuncRef {
@@ -256,7 +256,7 @@ impl TestHarness {
         let mint_authority = wallet.token_mint_authority;
 
         let (frz_pk, frz_zkbin) =
-            self.proving_keys.get(&MONEY_CONTRACT_ZKAS_TOKEN_FRZ_NS_V1.to_string()).unwrap();
+            self.proving_keys.get(MONEY_CONTRACT_ZKAS_TOKEN_FRZ_NS_V1).unwrap();
 
         let auth_func_id = FuncRef {
             contract_id: *MONEY_CONTRACT_ID,

src/contract/test-harness/src/money_transfer.rs

@@ -49,11 +49,8 @@ impl TestHarness {
         let wallet = self.holders.get(holder).unwrap();
         let rcpt = self.holders.get(recipient).unwrap().keypair.public;
 
-        let (mint_pk, mint_zkbin) =
-            self.proving_keys.get(&MONEY_CONTRACT_ZKAS_MINT_NS_V1.to_string()).unwrap();
-
-        let (burn_pk, burn_zkbin) =
-            self.proving_keys.get(&MONEY_CONTRACT_ZKAS_BURN_NS_V1.to_string()).unwrap();
+        let (mint_pk, mint_zkbin) = self.proving_keys.get(MONEY_CONTRACT_ZKAS_MINT_NS_V1).unwrap();
+        let (burn_pk, burn_zkbin) = self.proving_keys.get(MONEY_CONTRACT_ZKAS_BURN_NS_V1).unwrap();
 
         // Create the transfer call
         let (params, secrets, mut spent_coins) = make_transfer_call(

src/event_graph/util.rs

@@ -116,8 +116,6 @@ pub(super) fn generate_genesis(days_rotation: u64) -> Event {
 
 #[cfg(test)]
 mod tests {
-    use crate::event_graph::INITIAL_GENESIS;
-
     use super::*;
 
     #[test]

src/net/hosts/store.rs

@@ -1434,7 +1434,6 @@ mod tests {
     };
     use crate::{net::hosts::refinery::ping_node, system::sleep};
     use smol::Executor;
-    use std::{sync::Arc, time::UNIX_EPOCH};
 
     #[test]
     fn test_ping_node() {

src/rpc/server.rs

@@ -348,7 +348,7 @@ pub async fn listen_and_serve(
 mod tests {
     use super::*;
     use crate::{rpc::client::RpcClient, system::msleep};
-    use smol::{lock::Mutex, net::TcpListener, Executor};
+    use smol::{net::TcpListener, Executor};
 
     struct RpcServer {
         rpc_connections: Mutex<HashSet<StoppableTaskPtr>>,

src/runtime/memory.rs

@@ -42,7 +42,7 @@ mod tests {
     use std::io::Cursor;
 
     use darkfi_serial::Decodable;
-    use wasmer::{Memory, MemoryType, Store, WasmPtr};
+    use wasmer::{Memory, MemoryType, Store};
 
     #[test]
     fn test_memoryview_writeslice() {

src/sdk/python/src/pasta.rs

@@ -20,7 +20,7 @@ use std::ops::Deref;
 
 use darkfi_sdk::{
     crypto::{constants::NullifierK, pasta_prelude::*, util},
-    pasta::{group::ff::FromUniformBytes, pallas, vesta},
+    pasta::{pallas, vesta},
 };
 use halo2_gadgets::ecc::chip::FixedPoint;
 use pyo3::{

src/sdk/src/crypto/constants/fixed_bases/commit_ivk_r.rs

@@ -2953,7 +2953,7 @@ mod tests {
         ecc::chip::constants::{test_lagrange_coeffs, test_zs_and_us},
         sinsemilla::primitives::CommitDomain,
     };
-    use pasta_curves::{arithmetic::CurveAffine, group::Curve, pallas};
+    use pasta_curves::group::Curve;
 
     #[test]
     fn generator() {

src/sdk/src/crypto/constants/fixed_bases/note_commit_r.rs

@@ -2954,7 +2954,7 @@ mod tests {
         sinsemilla::primitives::CommitDomain,
     };
 
-    use pasta_curves::{arithmetic::CurveAffine, group::Curve, pallas};
+    use pasta_curves::group::Curve;
 
     #[test]
     fn generator() {

src/sdk/src/crypto/constants/fixed_bases/nullifier_k.rs

@@ -2949,7 +2949,7 @@ mod tests {
         *,
     };
     use halo2_gadgets::ecc::chip::constants::{test_lagrange_coeffs, test_zs_and_us};
-    use pasta_curves::{arithmetic::CurveExt, group::Curve, pallas};
+    use pasta_curves::{arithmetic::CurveExt, group::Curve};
 
     #[test]
     fn generator() {

src/sdk/src/crypto/constants/fixed_bases/spend_auth_g.rs

@@ -2951,11 +2951,7 @@ mod tests {
         *,
     };
     use halo2_gadgets::ecc::chip::constants::{test_lagrange_coeffs, test_zs_and_us};
-    use pasta_curves::{
-        arithmetic::{CurveAffine, CurveExt},
-        group::Curve,
-        pallas,
-    };
+    use pasta_curves::{arithmetic::CurveExt, group::Curve};
 
     #[test]
     fn generator() {

src/sdk/src/crypto/constants/fixed_bases/value_commit_r.rs

@@ -2951,11 +2951,7 @@ mod tests {
         *,
     };
     use halo2_gadgets::ecc::chip::constants::{test_lagrange_coeffs, test_zs_and_us};
-    use pasta_curves::{
-        arithmetic::{CurveAffine, CurveExt},
-        group::Curve,
-        pallas,
-    };
+    use pasta_curves::{arithmetic::CurveExt, group::Curve};
 
     #[test]
     fn generator() {

src/sdk/src/crypto/constants/fixed_bases/value_commit_v.rs

@@ -804,11 +804,7 @@ mod tests {
         *,
     };
     use halo2_gadgets::ecc::chip::constants::{test_lagrange_coeffs, test_zs_and_us};
-    use pasta_curves::{
-        arithmetic::{CurveAffine, CurveExt},
-        group::Curve,
-        pallas,
-    };
+    use pasta_curves::{arithmetic::CurveExt, group::Curve};
 
     #[test]
     fn generator() {

src/sdk/src/crypto/constants/sinsemilla.rs

@@ -145,14 +145,12 @@ impl CommitDomains<pallas::Affine, OrchardFixedBases, OrchardHashDomains> for Or
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::crypto::constants::{
-        fixed_bases::{COMMIT_IVK_PERSONALIZATION, NOTE_COMMITMENT_PERSONALIZATION},
-        sinsemilla::MERKLE_CRH_PERSONALIZATION,
+    use crate::crypto::constants::fixed_bases::{
+        COMMIT_IVK_PERSONALIZATION, NOTE_COMMITMENT_PERSONALIZATION,
     };
     use halo2_gadgets::sinsemilla::primitives::{CommitDomain, HashDomain};
-    use halo2_proofs::{arithmetic::CurveAffine, pasta::pallas};
-    use pasta_curves::group::{ff::PrimeField, Curve};
-    use rand::{self, rngs::OsRng, Rng};
+    use pasta_curves::group::Curve;
+    use rand::{rngs::OsRng, Rng};
 
     #[test]
     // Nodes in the Merkle tree are Pallas base field elements.

src/sdk/src/crypto/merkle_node.rs

@@ -166,7 +166,6 @@ mod tests {
     use super::*;
 
     use halo2_proofs::arithmetic::Field;
-    use pasta_curves::pallas;
     use rand::rngs::OsRng;
 
     #[test]

src/sdk/src/crypto/note.rs

@@ -157,7 +157,6 @@ mod tests {
     use super::*;
     use crate::crypto::Keypair;
 
-    use halo2_proofs::arithmetic::Field;
     use rand::rngs::OsRng;
 
     #[test]

src/sdk/src/crypto/smt.rs

@@ -390,17 +390,14 @@ mod tests {
 
     /// Helper to change leaves array to BTreeMap and then create SMT.
     fn create_merkle_tree<
-        F: WithSmallOrderMulGroup<3> + Ord,
+        F: WithSmallOrderMulGroup<3> + Ord + FromUniformBytes<64>,
         H: FieldHasher<F, 2>,
         const N: usize,
     >(
         hasher: H,
         leaves: &[F],
         default_leaf: &[u8; 64],
-    ) -> SparseMerkleTree<F, H, N>
-    where
-        F: FromUniformBytes<64>,
-    {
+    ) -> SparseMerkleTree<F, H, N> {
         SparseMerkleTree::<F, H, N>::new_sequential(leaves, &hasher, default_leaf).unwrap()
     }
 

src/system/stoppable_task.rs

@@ -143,8 +143,6 @@ mod tests {
     use super::*;
     use crate::{error::Error, system::sleep_forever};
     use log::warn;
-    use smol::Executor;
-    use std::sync::Arc;
 
     #[test]
     fn stoppit_mom() {

src/util/parse.rs

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-use std::{iter::FromIterator, str::FromStr};
+use std::str::FromStr;
 
 use crate::{Error, Result};
 

src/zk/gadget/less_than.rs

@@ -273,9 +273,8 @@ mod tests {
     use super::*;
     use darkfi_sdk::crypto::pasta_prelude::PrimeField;
     use halo2_proofs::{
-        circuit::{floor_planner, Value},
+        circuit::floor_planner,
         dev::{CircuitLayout, MockProver},
-        pasta::pallas,
         plonk::Circuit,
     };
 

src/zk/gadget/small_range_check.rs

@@ -109,7 +109,6 @@ mod tests {
         circuit::{floor_planner, Value},
         dev::MockProver,
         pasta::pallas,
-        plonk,
         plonk::Circuit,
     };
 

src/zkas/parser.rs

@@ -61,18 +61,16 @@ where
     K: Eq + Hash + Send + Sync + Clone + 'static,
     V: Send + Sync + Clone + 'static,
 {
-    fn contains_key<Q: ?Sized>(&self, k: &Q) -> bool
+    fn contains_key<Q: Hash + Eq + ?Sized>(&self, k: &Q) -> bool
     where
         K: Borrow<Q>,
-        Q: Hash + Eq,
     {
         self.map.contains_key(k)
     }
 
-    fn get<Q: ?Sized>(&self, k: &Q) -> Option<&V>
+    fn get<Q: Hash + Eq + ?Sized>(&self, k: &Q) -> Option<&V>
     where
         K: Borrow<Q>,
-        Q: Hash + Eq,
     {
         self.map.get(k)
     }