Removed commented code

Author: 0xMimir

node/src/consensus/consensus_reducer.rs

@@ -5,7 +5,14 @@ use openmina_core::{
 use snark::block_verify::{SnarkBlockVerifyAction, SnarkBlockVerifyError};
 
 use crate::{
-    transition_frontier::sync::{ledger::{snarked::TransitionFrontierSyncLedgerSnarkedAction, staged::TransitionFrontierSyncLedgerStagedAction}, TransitionFrontierSyncAction}, Action, State, WatchedAccountsAction,
+    transition_frontier::sync::{
+        ledger::{
+            snarked::TransitionFrontierSyncLedgerSnarkedAction,
+            staged::TransitionFrontierSyncLedgerStagedAction,
+        },
+        TransitionFrontierSyncAction,
+    },
+    Action, State, WatchedAccountsAction,
 };
 
 use super::{

node/src/p2p/callbacks/mod.rs

@@ -1,3 +1,3 @@
 mod p2p_callbacks_actions;
 pub use p2p_callbacks_actions::P2pCallbacksAction;
-mod p2p_callbacks_reducer;
+mod p2p_callbacks_reducer;

node/src/p2p/callbacks/p2p_callbacks_actions.rs

@@ -42,7 +42,15 @@ pub enum P2pCallbacksAction {
 }
 
 impl redux::EnablingCondition<crate::State> for P2pCallbacksAction {
-    fn is_enabled(&self, state: &crate::State, time: redux::Timestamp) -> bool {
-        true
+    fn is_enabled(&self, _state: &crate::State, _time: redux::Timestamp) -> bool {
+        match self {
+            P2pCallbacksAction::P2pChannelsRpcReady { .. } => true,
+            P2pCallbacksAction::P2pChannelsRpcTimeout { .. } => true,
+            P2pCallbacksAction::P2pChannelsRpcResponseReceived { .. } => true,
+            P2pCallbacksAction::P2pChannelsRpcRequestReceived { .. } => true,
+            P2pCallbacksAction::P2pChannelsStreamingRpcReady => true,
+            P2pCallbacksAction::P2pChannelsStreamingRpcTimeout { .. } => true,
+            P2pCallbacksAction::P2pChannelsStreamingRpcResponseReceived { .. } => true,
+        }
     }
 }

node/src/p2p/callbacks/p2p_callbacks_reducer.rs

@@ -2,7 +2,10 @@ use ark_ff::fields::arithmetic::InvalidBigInt;
 use mina_p2p_messages::v2::{MinaLedgerSyncLedgerAnswerStableV2, StateHash};
 use openmina_core::{block::BlockWithHash, bug_condition};
 use p2p::{
-    channels::{rpc::{BestTipWithProof, P2pChannelsRpcAction, P2pRpcRequest, P2pRpcResponse}, streaming_rpc::P2pStreamingRpcResponseFull},
+    channels::{
+        rpc::{BestTipWithProof, P2pChannelsRpcAction, P2pRpcRequest, P2pRpcResponse},
+        streaming_rpc::P2pStreamingRpcResponseFull,
+    },
     disconnection::{P2pDisconnectionAction, P2pDisconnectionReason},
 };
 use redux::ActionWithMeta;

node/src/p2p/p2p_effects.rs

@@ -171,7 +171,7 @@ impl RpcState {
             RpcAction::BestChain { .. } => {}
             RpcAction::ConsensusConstantsGet { .. } => {}
             RpcAction::TransactionStatusGet { .. } => {}
-            RpcAction::P2pConnectionIncomingAnswerReady { .. } => {},
+            RpcAction::P2pConnectionIncomingAnswerReady { .. } => {}
         }
     }
 }

node/src/rpc/rpc_reducer.rs

@@ -39,9 +39,7 @@ use crate::transition_frontier::genesis::TransitionFrontierGenesisState;
 use crate::transition_frontier::sync::ledger::snarked::{
     TransitionFrontierSyncLedgerSnarkedAction, TransitionFrontierSyncLedgerSnarkedState,
 };
-use crate::transition_frontier::sync::ledger::staged::{
-    TransitionFrontierSyncLedgerStagedAction, TransitionFrontierSyncLedgerStagedState,
-};
+use crate::transition_frontier::sync::ledger::staged::TransitionFrontierSyncLedgerStagedState;
 use crate::transition_frontier::sync::ledger::TransitionFrontierSyncLedgerState;
 use crate::transition_frontier::sync::TransitionFrontierSyncState;
 pub use crate::transition_frontier::TransitionFrontierState;
@@ -354,7 +352,13 @@ impl P2p {
             return Err(P2pInitializationError::AlreadyInitialized);
         };
 
-        let callbacks = P2pCallbacks {
+        let callbacks = Self::p2p_callbacks();
+        *self = P2p::Ready(P2pState::new(config.clone(), callbacks, chain_id));
+        Ok(())
+    }
+
+    fn p2p_callbacks() -> P2pCallbacks {
+        P2pCallbacks {
             on_p2p_channels_transaction_libp2p_received: Some(redux::callback!(
                 on_p2p_channels_transaction_libp2p_received(transaction: Box<MinaBaseUserCommandStableV2>) -> crate::Action{
                     TransactionPoolAction::StartVerify { commands: std::iter::once(*transaction).collect(), from_rpc: None }
@@ -450,10 +454,7 @@ impl P2p {
                     P2pCallbacksAction::P2pChannelsStreamingRpcTimeout { peer_id, id }
                 }
             )),
-        };
-
-        *self = P2p::Ready(P2pState::new(config.clone(), callbacks, chain_id));
-        Ok(())
+        }
     }
 
     pub fn ready(&self) -> Option<&P2pState> {

node/src/state.rs

@@ -172,7 +172,7 @@ impl P2pConnectionIncomingState {
                     answer: answer.clone(),
                 });
 
-                if let Some(rpc_id) = p2p_state.peer_connection_rpc_id(&peer_id) {
+                if let Some(rpc_id) = p2p_state.peer_connection_rpc_id(peer_id) {
                     if let Some(callback) =
                         &p2p_state.callbacks.on_p2p_connection_incoming_answer_ready
                     {