(feat/malloc_size_of): fix clippy warns and rebase mistakes

Author: vlad9486

node/src/rpc/heartbeat.rs

@@ -179,8 +179,8 @@ impl NodeHeartbeat {
 pub(crate) mod tests {
 
     use crate::rpc::{
-        RpcNodeStatusSnarkPool, RpcNodeStatusTransactionPool, RpcNodeStatusTransitionFrontier,
-        RpcNodeStatusTransitionFrontierSync,
+        RpcNodeStatusResources, RpcNodeStatusSnarkPool, RpcNodeStatusTransactionPool,
+        RpcNodeStatusTransitionFrontier, RpcNodeStatusTransitionFrontierSync,
     };
 
     use super::*;
@@ -252,6 +252,11 @@ pub(crate) mod tests {
                 snark_pool: RpcNodeStatusSnarkPool::default(),
                 transaction_pool: RpcNodeStatusTransactionPool::default(),
                 current_block_production_attempt: None,
+                resources_status: RpcNodeStatusResources {
+                    p2p_malloc_size: 0,
+                    transition_frontier: serde_json::Value::Null,
+                    snark_pool: serde_json::Value::Null,
+                },
             },
             node_timestamp: Timestamp::ZERO,
             peer_id: "2bEgBrPTzL8wov2D4Kz34WVLCxR4uCarsBmHYXWKQA5wvBQzd9H"

node/src/rpc/mod.rs

@@ -1,5 +1,5 @@
 mod rpc_state;
-use std::collections::{BTreeMap, BTreeSet};
+use std::collections::BTreeMap;
 use std::str::FromStr;
 
 use ark_ff::fields::arithmetic::InvalidBigInt;

node/src/rpc_effectful/rpc_effectful_effects.rs

@@ -815,7 +815,7 @@ fn compute_node_status<S: Service>(store: &mut Store<S>) -> RpcNodeStatus {
                 let mut set = BTreeSet::new();
                 let fun = move |ptr: *const c_void| !set.insert(ptr.addr());
                 let mut ops = MallocSizeOfOps::new(None, Some(Box::new(fun)));
-                size_of_val(&state.p2p) + state.p2p.size_of(&mut ops)
+                size_of_val(&state.p2p).saturating_add(state.p2p.size_of(&mut ops))
             },
             transition_frontier: state.transition_frontier.resources_usage(),
             snark_pool: state.snark_pool.resources_usage(),

node/src/snark_pool/candidate/snark_pool_candidate_state.rs

@@ -52,18 +52,16 @@ impl SnarkPoolCandidatesState {
     }
 
     pub fn check(&self) -> (usize, Vec<(PeerId, SnarkJobId)>) {
-        let len = self.by_peer.iter().map(|(_, v)| v.len()).sum::<usize>();
+        let len = self.by_peer.values().map(BTreeMap::len).sum::<usize>();
         let lhs = self
             .by_job_id
             .iter()
-            .map(|(job_id, v)| v.iter().map(|peer_id| (*peer_id, job_id.clone())))
-            .flatten()
+            .flat_map(|(job_id, v)| v.iter().map(|peer_id| (*peer_id, job_id.clone())))
             .collect::<BTreeSet<_>>();
         let rhs = self
             .by_peer
             .iter()
-            .map(|(peer_id, v)| v.keys().map(|job_id| (*peer_id, job_id.clone())))
-            .flatten()
+            .flat_map(|(peer_id, v)| v.keys().map(|job_id| (*peer_id, job_id.clone())))
             .collect::<BTreeSet<_>>();
         let inconsistency = lhs.symmetric_difference(&rhs).cloned().collect();
         (len, inconsistency)

node/src/transition_frontier/transition_frontier_state.rs

@@ -207,7 +207,9 @@ impl TransitionFrontierState {
             "diff_tx_size": self
                 .chain_diff
                 .as_ref()
-                .map(|d| d.new_commands.len() + d.removed_commands.len())
+                // `saturating_add` is not needed here as collection size cannot overflow usize
+                // but it makes clippy satisfied
+                .map(|d| d.new_commands.len().saturating_add(d.removed_commands.len()))
                 .unwrap_or_default()
         })
     }

p2p/src/network/pubsub/p2p_network_pubsub_state.rs

@@ -440,18 +440,6 @@ mod measurement {
 
     use super::*;
 
-    pub fn snark(val: &Vec<(Snark, u32)>, ops: &mut MallocSizeOfOps) -> usize {
-        // TODO(vlad):
-        let _ = (val, ops);
-        0
-    }
-
-    pub fn transaction(val: &Vec<(Transaction, u32)>, ops: &mut MallocSizeOfOps) -> usize {
-        // TODO(vlad):
-        let _ = (val, ops);
-        0
-    }
-
     pub fn clients(
         val: &BTreeMap<PeerId, P2pNetworkPubsubClientState>,
         ops: &mut MallocSizeOfOps,