Fix clippy errors and warnings

cli/src/commands/node/mod.rs

@@ -35,7 +35,7 @@ use openmina_node_native::{http_server, tracing, NodeService, P2pTaskSpawner, Rp
 
 // old:
 // 3c41383994b87449625df91769dff7b507825c064287d30fada9286f3f1cb15e
-const CHAIN_ID: &'static str = openmina_core::CHAIN_ID;
+const CHAIN_ID: &str = openmina_core::CHAIN_ID;
 
 /// Openmina node
 #[derive(Debug, clap::Args)]

cli/src/commands/replay/replay_state_with_input_actions.rs

@@ -47,7 +47,7 @@ impl ReplayStateWithInputActions {
             // index/srs doesn't match deserialized one.
             state.snark.block_verify.verifier_index =
                 node::snark::get_verifier_index(VerifierKind::Blockchain).into();
-            state.snark.block_verify.verifier_srs = node::snark::get_srs().into();
+            state.snark.block_verify.verifier_srs = node::snark::get_srs();
             state
         };
 
@@ -203,7 +203,7 @@ fn dyn_effects(store: &mut Store<NodeService>, action: &ActionWithMeta) {
 }
 
 thread_local! {
-    static DYN_EFFECTS_LIB: RefCell<Option<DynEffectsLib>> = RefCell::new(None);
+    static DYN_EFFECTS_LIB: RefCell<Option<DynEffectsLib>> = const { RefCell::new(None) };
 }
 
 struct DynEffectsLib {

core/src/block/block_with_hash.rs

@@ -156,16 +156,14 @@ impl<T: AsRef<Block>> BlockWithHash<T> {
                 }
             }
         }
-        match diff.1.as_ref() {
-            Some(v) => match &v.coinbase {
-                StagedLedgerDiffDiffPreDiffWithAtMostOneCoinbaseStableV2Coinbase::Zero => {}
-                StagedLedgerDiffDiffPreDiffWithAtMostOneCoinbaseStableV2Coinbase::One(v) => {
-                    coinbases.push(v.as_ref());
-                }
-            },
-            _ => {}
+        if let Some(v) = diff.1.as_ref() {
+            if let StagedLedgerDiffDiffPreDiffWithAtMostOneCoinbaseStableV2Coinbase::One(coinbase) =
+                &v.coinbase
+            {
+                coinbases.push(coinbase.as_ref());
+            }
         }
-        coinbases.into_iter().filter_map(|v| v)
+        coinbases.into_iter().flatten()
     }
 
     pub fn completed_works_iter<'a>(
@@ -198,7 +196,7 @@ impl<T: AsRef<BlockHeader>> BlockHeaderWithHash<T> {
     }
 
     pub fn header(&self) -> &BlockHeader {
-        &self.header.as_ref()
+        self.header.as_ref()
     }
 
     pub fn consensus_state(&self) -> &ConsensusProofOfStakeDataConsensusStateValueStableV2 {

core/src/consensus.rs

@@ -53,7 +53,7 @@ pub fn is_short_range_fork(a: &MinaConsensusState, b: &MinaConsensusState) -> bo
         a_prev_lock_checkpoint == b_prev_lock_checkpoint
     } else {
         // Check for previous epoch case using both orientations
-        check(&a, &b) || check(&b, &a)
+        check(a, b) || check(b, a)
     }
 }
 
@@ -85,6 +85,9 @@ pub fn relative_min_window_density(b1: &MinaConsensusState, b2: &MinaConsensusSt
 
         // Ring-shift
         let mut i = relative_sub_window_from_global_slot(global_slot(b1));
+        // TODO(binier): is this correct?
+        // lint: this loops only once with `_` being `0..=shift_count`
+        #[allow(clippy::single_element_loop)]
         for _ in [0..=shift_count] {
             i = (i + 1) % SUB_WINDOWS_PER_WINDOW;
             projected_window[i as usize] = 0;
@@ -121,7 +124,7 @@ pub fn short_range_fork_take(
 
     let tip_height = &tip_cs.blockchain_length;
     let candidate_height = &candidate_cs.blockchain_length;
-    match candidate_height.cmp(&tip_height) {
+    match candidate_height.cmp(tip_height) {
         Greater => return (true, ChainLength),
         Less => return (false, ChainLength),
         Equal => {}
@@ -136,9 +139,9 @@ pub fn short_range_fork_take(
     }
 
     if candidate_hash > tip_hash {
-        return (true, StateHash);
+        (true, StateHash)
     } else {
-        return (false, StateHash);
+        (false, StateHash)
     }
 }
 
@@ -161,7 +164,7 @@ pub fn long_range_fork_take(
 
     let tip_height = &tip_cs.blockchain_length;
     let candidate_height = &candidate_cs.blockchain_length;
-    match candidate_height.cmp(&tip_height) {
+    match candidate_height.cmp(tip_height) {
         Greater => return (true, ChainLength),
         Less => return (false, ChainLength),
         Equal => {}
@@ -176,9 +179,9 @@ pub fn long_range_fork_take(
     }
 
     if candidate_hash > tip_hash {
-        return (true, StateHash);
+        (true, StateHash)
     } else {
-        return (false, StateHash);
+        (false, StateHash)
     }
 }
 

core/src/constants.rs

@@ -2,8 +2,7 @@ use binprot_derive::BinProtWrite;
 use mina_hasher::Fp;
 use mina_p2p_messages::{bigint, number, v2};
 
-pub const GENESIS_PRODUCER_SK: &'static str =
-    "EKFKgDtU3rcuFTVSEpmpXSkukjmX4cKefYREi6Sdsk7E7wsT7KRw";
+pub const GENESIS_PRODUCER_SK: &str = "EKFKgDtU3rcuFTVSEpmpXSkukjmX4cKefYREi6Sdsk7E7wsT7KRw";
 
 pub const PROTOCOL_VERSION: v2::ProtocolVersionStableV2 = v2::ProtocolVersionStableV2 {
     transaction: number::Number(2),

core/src/invariants.rs

@@ -8,13 +8,13 @@ pub trait InvariantService: redux::Service {
 pub struct InvariantsState(Vec<Box<dyn 'static + Send + Any>>);
 
 impl InvariantsState {
-    pub fn get<'a, T: 'static + Send + Default>(&'a mut self, i: usize) -> &'a mut T {
+    pub fn get<T: 'static + Send + Default>(&mut self, i: usize) -> &mut T {
         self.0.resize_with(i + 1, || Box::new(()));
         let v = self.0.get_mut(i).unwrap();
         if v.is::<T>() {
             v.downcast_mut().unwrap()
         } else {
-            *v = Box::new(T::default());
+            *v = Box::<T>::default();
             v.downcast_mut().unwrap()
         }
     }

core/src/lib.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::too_many_arguments)]
+
 pub mod invariants;
 pub mod log;
 pub mod requests;
@@ -13,8 +15,7 @@ pub mod snark;
 pub mod consensus;
 
 /// Default chain id, as used by [berkeleynet](https://berkeley.minaexplorer.com/status).
-pub const CHAIN_ID: &'static str =
-    "fd7d111973bf5a9e3e87384f560fdead2f272589ca00b6d9e357fca9839631da";
+pub const CHAIN_ID: &str = "fd7d111973bf5a9e3e87384f560fdead2f272589ca00b6d9e357fca9839631da";
 
 pub fn preshared_key(chain_id: &str) -> [u8; 32] {
     use multihash::{Blake2b256, Hasher};

core/src/requests/mod.rs

@@ -144,7 +144,7 @@ where
         use serde::de::{self, MapAccess, SeqAccess, Visitor};
         struct RequestsVisitor<IdType, Request>(std::marker::PhantomData<(IdType, Request)>);
 
-        const FIELDS: &'static [&'static str] = &["list", "counter", "last_added_req_id"];
+        const FIELDS: &[&str] = &["list", "counter", "last_added_req_id"];
 
         impl<'de, IdType, Request> Visitor<'de> for RequestsVisitor<IdType, Request>
         where

core/src/requests/request_id.rs

@@ -138,11 +138,7 @@ impl<T: RequestIdType> fmt::Debug for RequestId<T> {
 
 impl<T> Clone for RequestId<T> {
     fn clone(&self) -> Self {
-        Self {
-            locator: self.locator,
-            counter: self.counter,
-            _phantom_request_type: self._phantom_request_type.clone(),
-        }
+        *self
     }
 }
 

core/src/snark/snark_cmp.rs

@@ -71,7 +71,7 @@ where
     for<'a> &'a T: Into<SnarkCmp<'a>>,
 {
     fn eq(&self, other: &T) -> bool {
-        Into::<SnarkCmp<'_>>::into(&*self) == Into::<SnarkCmp<'_>>::into(other)
+        Into::<SnarkCmp<'_>>::into(self) == Into::<SnarkCmp<'_>>::into(other)
     }
 }
 

core/src/snark/snark_job_id.rs

@@ -36,7 +36,7 @@ impl std::str::FromStr for LedgerHashTransition {
     type Err = ();
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let (source, target) = s.split_once("-").ok_or(())?;
+        let (source, target) = s.split_once('-').ok_or(())?;
         Ok(Self {
             source: source.parse()?,
             target: target.parse()?,
@@ -58,7 +58,7 @@ impl FromStr for LedgerHashTransitionPasses {
     type Err = ();
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let (first_pass, second_pass) = s.split_once("_").ok_or(())?;
+        let (first_pass, second_pass) = s.split_once('_').ok_or(())?;
         Ok(Self {
             first_pass_ledger: first_pass.parse().or(Err(()))?,
             second_pass_ledger: second_pass.parse().or(Err(()))?,

ledger/src/account/common.rs

@@ -278,7 +278,7 @@ impl AuthRequired {
 
         match self {
             Impossible | Proof => Signature,
-            x => x.clone(),
+            x => *x,
         }
     }
 }

ledger/src/account/conv.rs

@@ -123,7 +123,7 @@ where
     T: 'a,
     F: Fn(&T) -> U,
 {
-    value.each_ref().map(|value| fun(value))
+    value.each_ref().map(fun)
 }
 
 impl From<&MinaBaseVerificationKeyWireStableV1> for VerificationKey {
@@ -501,8 +501,8 @@ impl From<&MinaBaseAccountBinableArgStableV2> for Account {
                 let s: String = (&acc.token_symbol).try_into().unwrap();
                 TokenSymbol::from(s)
             },
-            balance: Balance::from_u64(acc.balance.0 .0 .0 .0 as u64),
-            nonce: Nonce::from_u32(acc.nonce.0 .0 as u32),
+            balance: Balance::from_u64(acc.balance.0 .0 .0 .0),
+            nonce: Nonce::from_u32(acc.nonce.0 .0),
             receipt_chain_hash: ReceiptChainHash((&acc.receipt_chain_hash.0).into()),
             delegate: acc.delegate.as_ref().map(|d| d.inner().into()),
             voting_for: VotingFor(acc.voting_for.0.to_field()),

ledger/src/address/raw.rs

@@ -330,7 +330,7 @@ impl<const NBYTES: usize> Address<NBYTES> {
             .rev()
             .enumerate()
             .find_map(|(index, byte)| match byte.trailing_ones() as usize {
-                x if x == 8 => None,
+                8 => None,
                 x => Some((nused_bytes - index) * 8 - x - 1),
             })?;
 
@@ -361,7 +361,7 @@ impl<const NBYTES: usize> Address<NBYTES> {
             .rev()
             .enumerate()
             .find_map(|(index, byte)| match byte.trailing_zeros() as usize {
-                x if x == 8 => None,
+                8 => None,
                 x => Some((nused_bytes - index) * 8 - x - 1),
             })?;
 

ledger/src/database/database.rs

@@ -1003,7 +1003,7 @@ mod tests_ocaml {
             let index = rand::thread_rng().gen_range(0..NACCOUNTS);
             let index = AccountIndex(index as u64);
 
-            db.set_at_index(index.clone(), account.clone()).unwrap();
+            db.set_at_index(index, account.clone()).unwrap();
             let at_index = db.get_at_index(index).unwrap();
             assert_eq!(account, at_index);
         }

ledger/src/database/database_impl.rs

@@ -667,7 +667,7 @@ impl BaseLedger for DatabaseImpl<V2> {
     fn set(&mut self, addr: Address, account: Box<Account>) {
         let index = addr.to_index();
 
-        self.hashes_matrix.invalidate_hashes(index.clone());
+        self.hashes_matrix.invalidate_hashes(index);
 
         let index: usize = index.0 as usize;
 

ledger/src/mask/mask_impl.rs

@@ -392,7 +392,7 @@ impl MaskImpl {
                 };
 
                 for (index, account) in accounts {
-                    let addr = Address::from_index(index.clone(), depth);
+                    let addr = Address::from_index(index, depth);
                     parent.set_impl(addr, Box::new(account), Some(self_uuid.clone()));
                 }
 
@@ -439,7 +439,7 @@ impl MaskImpl {
         assert!(self.is_attached());
 
         for child in self.childs().values() {
-            child.parent_set_notify(account_index.clone(), account)
+            child.parent_set_notify(account_index, account)
         }
 
         match self {
@@ -455,12 +455,11 @@ impl MaskImpl {
 
                 hashes.invalidate_hashes(account_index);
 
-                let own_account = match {
-                    id_to_addr
-                        .get(&account_id)
-                        .and_then(|addr| owning_account.get(&addr.to_index()))
-                        .cloned()
-                } {
+                let own_account = match id_to_addr
+                    .get(&account_id)
+                    .and_then(|addr| owning_account.get(&addr.to_index()))
+                    .cloned()
+                {
                     Some(own) => own,
                     None => return,
                 };
@@ -812,7 +811,7 @@ impl MaskImpl {
 
                 for addr in addrs.iter().rev() {
                     let account_index = addr.to_index();
-                    hashes.invalidate_hashes(account_index.clone());
+                    hashes.invalidate_hashes(account_index);
 
                     let account = owning_account.remove(&account_index).unwrap();
                     token_to_account.remove(&account.token_id).unwrap();
@@ -845,7 +844,7 @@ impl MaskImpl {
             if Some(uuid) == child_to_ignore.as_ref() {
                 continue;
             }
-            child.parent_set_notify(account_index.clone(), &account)
+            child.parent_set_notify(account_index, &account)
         }
 
         match self {
@@ -867,7 +866,7 @@ impl MaskImpl {
                 let account_id = account.id();
                 let token_id = account.token_id.clone();
 
-                owning_account.insert(account_index.clone(), *account);
+                owning_account.insert(account_index, *account);
                 id_to_addr.insert(account_id.clone(), addr.clone());
                 token_to_account.insert(token_id, account_id);
 
@@ -937,7 +936,7 @@ impl MaskImpl {
         for index in 0..(2u64.pow(tree_depth as u32)) {
             let index = AccountIndex(index);
             match self
-                .get_account_hash(index.clone())
+                .get_account_hash(index)
                 .filter(|hash| hash != &empty_account_hash)
             {
                 None => break,
@@ -1200,7 +1199,7 @@ impl BaseLedger for MaskImpl {
                 id_to_addr.insert(account_id.clone(), location.clone());
                 *last_location = Some(location.clone());
                 token_to_account.insert(token_id, account_id);
-                owning_account.insert(account_index.clone(), account);
+                owning_account.insert(account_index, account);
 
                 self.invalidate_hashes(account_index);
 
@@ -1434,7 +1433,7 @@ impl BaseLedger for MaskImpl {
 
         self.recurse_on_childs(&mut |child| {
             for index in &indexes {
-                child.invalidate_hashes(index.clone());
+                child.invalidate_hashes(*index);
             }
         });
     }

ledger/src/ondisk/mod.rs

@@ -55,9 +55,9 @@
 //! ```
 
 pub mod batch;
-pub(self) mod compression;
+mod compression;
 mod database;
-pub(self) mod lock;
+mod lock;
 
 pub use batch::Batch;
 pub use database::*;