(feat/malloc_size_of): refactor slightly

Author: vlad9486

node/src/rpc/mod.rs

@@ -467,23 +467,8 @@ pub struct RpcNodeStatus {
 #[derive(Serialize, Debug, Clone)]
 pub struct RpcNodeStatusResources {
     pub p2p_malloc_size: usize,
-    pub transition_frontier: RpcNodeStatusResourcesTransitionFrontier,
-    pub snark_pool: RpcNodeStatusResourcesSnarkPool,
-}
-
-#[derive(Serialize, Debug, Clone)]
-pub struct RpcNodeStatusResourcesTransitionFrontier {
-    pub best_chain_size: usize,
-    pub needed_protocol_states_size: usize,
-    pub blacklist_size: usize,
-    pub diff_tx_size: usize,
-}
-
-#[derive(Serialize, Debug, Clone)]
-pub struct RpcNodeStatusResourcesSnarkPool {
-    pub pool_size: usize,
-    pub candidates_size: usize,
-    pub candidates_inconsistency: BTreeSet<(PeerId, SnarkJobId)>,
+    pub transition_frontier: serde_json::Value,
+    pub snark_pool: serde_json::Value,
 }
 
 #[derive(Serialize, Debug, Clone)]

node/src/rpc_effectful/rpc_effectful_effects.rs

@@ -14,15 +14,13 @@ use crate::{
         AccountQuery, AccountSlim, ActionStatsQuery, ActionStatsResponse, CurrentMessageProgress,
         MessagesStats, NodeHeartbeat, RootLedgerSyncProgress, RootStagedLedgerSyncProgress,
         RpcAction, RpcBlockProducerStats, RpcMessageProgressResponse, RpcNodeStatus,
-        RpcNodeStatusResources, RpcNodeStatusResourcesSnarkPool,
-        RpcNodeStatusResourcesTransitionFrontier, RpcNodeStatusTransactionPool,
-        RpcNodeStatusTransitionFrontier, RpcNodeStatusTransitionFrontierBlockSummary,
-        RpcNodeStatusTransitionFrontierSync, RpcRequestExtraData, RpcScanStateSummary,
-        RpcScanStateSummaryBlock, RpcScanStateSummaryBlockTransaction,
-        RpcScanStateSummaryBlockTransactionKind, RpcScanStateSummaryScanStateJob,
-        RpcSnarkPoolJobFull, RpcSnarkPoolJobSnarkWork, RpcSnarkPoolJobSummary,
-        RpcSnarkerJobCommitResponse, RpcSnarkerJobSpecResponse, RpcTransactionInjectResponse,
-        TransactionStatus,
+        RpcNodeStatusResources, RpcNodeStatusTransactionPool, RpcNodeStatusTransitionFrontier,
+        RpcNodeStatusTransitionFrontierBlockSummary, RpcNodeStatusTransitionFrontierSync,
+        RpcRequestExtraData, RpcScanStateSummary, RpcScanStateSummaryBlock,
+        RpcScanStateSummaryBlockTransaction, RpcScanStateSummaryBlockTransactionKind,
+        RpcScanStateSummaryScanStateJob, RpcSnarkPoolJobFull, RpcSnarkPoolJobSnarkWork,
+        RpcSnarkPoolJobSummary, RpcSnarkerJobCommitResponse, RpcSnarkerJobSpecResponse,
+        RpcTransactionInjectResponse, TransactionStatus,
     },
     snark_pool::SnarkPoolAction,
     transition_frontier::sync::{
@@ -819,26 +817,8 @@ fn compute_node_status<S: Service>(store: &mut Store<S>) -> RpcNodeStatus {
                 let mut ops = MallocSizeOfOps::new(None, Some(Box::new(fun)));
                 size_of_val(&state.p2p) + state.p2p.size_of(&mut ops)
             },
-            transition_frontier: RpcNodeStatusResourcesTransitionFrontier {
-                best_chain_size: state.transition_frontier.best_chain.len(),
-                needed_protocol_states_size: state.transition_frontier.needed_protocol_states.len(),
-                blacklist_size: state.transition_frontier.blacklist.len(),
-                diff_tx_size: state
-                    .transition_frontier
-                    .chain_diff
-                    .as_ref()
-                    .map(|d| d.new_commands.len() + d.removed_commands.len())
-                    .unwrap_or_default(),
-            },
-            snark_pool: {
-                let (candidates_size, candidates_inconsistency) =
-                    state.snark_pool.candidates.check();
-                RpcNodeStatusResourcesSnarkPool {
-                    pool_size: state.snark_pool.pool.len(),
-                    candidates_size,
-                    candidates_inconsistency,
-                }
-            },
+            transition_frontier: state.transition_frontier.resources_usage(),
+            snark_pool: state.snark_pool.resources_usage(),
         },
     };
     status

node/src/snark_pool/candidate/snark_pool_candidate_state.rs

@@ -51,7 +51,7 @@ impl SnarkPoolCandidatesState {
         Self::default()
     }
 
-    pub fn check(&self) -> (usize, BTreeSet<(PeerId, SnarkJobId)>) {
+    pub fn check(&self) -> (usize, Vec<(PeerId, SnarkJobId)>) {
         let len = self.by_peer.iter().map(|(_, v)| v.len()).sum::<usize>();
         let lhs = self
             .by_job_id

node/src/snark_pool/snark_pool_state.rs

@@ -15,7 +15,7 @@ use super::SnarkPoolConfig;
 #[derive(Serialize, Deserialize, Clone)]
 pub struct SnarkPoolState {
     config: SnarkPoolConfig,
-    pub pool: DistributedPool<JobState, SnarkJobId>,
+    pool: DistributedPool<JobState, SnarkJobId>,
     pub candidates: SnarkPoolCandidatesState,
     pub(super) last_check_timeouts: Timestamp,
 }
@@ -203,6 +203,16 @@ impl SnarkPoolState {
         self.pool
             .next_messages_to_send(index_and_limit, |job| job.snark_msg())
     }
+
+    pub fn resources_usage(&self) -> serde_json::Value {
+        let (size, inconsistency) = self.candidates.check();
+
+        serde_json::json!({
+            "pool_size": self.pool.len(),
+            "candidates_size": size,
+            "candidates_inconsistency": inconsistency,
+        })
+    }
 }
 
 fn is_job_commitment_timed_out(job: &JobState, time_now: Timestamp) -> bool {

node/src/transition_frontier/transition_frontier_state.rs

@@ -196,4 +196,19 @@ impl TransitionFrontierState {
             reorg_best_tip: false, // TODO: Unused for now
         })
     }
+
+    pub fn resources_usage(&self) -> serde_json::Value {
+        serde_json::json!({
+            "best_chain_size": self.best_chain.len(),
+            "needed_protocol_states_size": self
+                .needed_protocol_states
+                .len(),
+            "blacklist_size": self.blacklist.len(),
+            "diff_tx_size": self
+                .chain_diff
+                .as_ref()
+                .map(|d| d.new_commands.len() + d.removed_commands.len())
+                .unwrap_or_default()
+        })
+    }
 }