Merge pull request #938 from 0xMimir/feat/reducer-porting-clenup

Updated channels to reuse logic

Author: 0xMimir

node/src/action.rs

@@ -113,6 +113,9 @@ impl redux::EnablingCondition<crate::State> for Action {
 
 impl From<redux::AnyAction> for Action {
     fn from(action: redux::AnyAction) -> Self {
-        *action.0.downcast::<Self>().expect("Downcast failed")
+        match action.0.downcast() {
+            Ok(action) => *action,
+            Err(action) => Self::P2p(*action.downcast().expect("Downcast failed")),
+        }
     }
 }

node/src/action_kind.rs

@@ -29,21 +29,13 @@ use crate::ledger::LedgerAction;
 use crate::ledger_effectful::LedgerEffectfulAction;
 use crate::p2p::callbacks::P2pCallbacksAction;
 use crate::p2p::channels::best_tip::P2pChannelsBestTipAction;
-use crate::p2p::channels::best_tip_effectful::P2pChannelsBestTipEffectfulAction;
 use crate::p2p::channels::rpc::P2pChannelsRpcAction;
-use crate::p2p::channels::rpc_effectful::P2pChannelsRpcEffectfulAction;
 use crate::p2p::channels::signaling::discovery::P2pChannelsSignalingDiscoveryAction;
-use crate::p2p::channels::signaling::discovery_effectful::P2pChannelsSignalingDiscoveryEffectfulAction;
 use crate::p2p::channels::signaling::exchange::P2pChannelsSignalingExchangeAction;
-use crate::p2p::channels::signaling::exchange_effectful::P2pChannelsSignalingExchangeEffectfulAction;
 use crate::p2p::channels::snark::P2pChannelsSnarkAction;
-use crate::p2p::channels::snark_effectful::P2pChannelsSnarkEffectfulAction;
 use crate::p2p::channels::snark_job_commitment::P2pChannelsSnarkJobCommitmentAction;
-use crate::p2p::channels::snark_job_commitment_effectful::P2pChannelsSnarkJobCommitmentEffectfulAction;
 use crate::p2p::channels::streaming_rpc::P2pChannelsStreamingRpcAction;
-use crate::p2p::channels::streaming_rpc_effectful::P2pChannelsStreamingRpcEffectfulAction;
 use crate::p2p::channels::transaction::P2pChannelsTransactionAction;
-use crate::p2p::channels::transaction_effectful::P2pChannelsTransactionEffectfulAction;
 use crate::p2p::channels::{
     P2pChannelsAction, P2pChannelsEffectfulAction, P2pChannelsMessageReceivedAction,
 };
@@ -221,9 +213,12 @@ pub enum ActionKind {
     P2pChannelsBestTipRequestReceived,
     P2pChannelsBestTipRequestSend,
     P2pChannelsBestTipResponseSend,
-    P2pChannelsBestTipEffectfulInit,
-    P2pChannelsBestTipEffectfulRequestSend,
-    P2pChannelsBestTipEffectfulResponseSend,
+    P2pChannelsEffectfulInitChannel,
+    P2pChannelsEffectfulMessageSend,
+    P2pChannelsEffectfulSignalingDiscoveryAnswerDecrypt,
+    P2pChannelsEffectfulSignalingDiscoveryOfferEncryptAndSend,
+    P2pChannelsEffectfulSignalingExchangeAnswerEncryptAndSend,
+    P2pChannelsEffectfulSignalingExchangeOfferDecrypt,
     P2pChannelsMessageReceived,
     P2pChannelsRpcInit,
     P2pChannelsRpcPending,
@@ -234,9 +229,6 @@ pub enum ActionKind {
     P2pChannelsRpcResponseReceived,
     P2pChannelsRpcResponseSend,
     P2pChannelsRpcTimeout,
-    P2pChannelsRpcEffectfulInit,
-    P2pChannelsRpcEffectfulRequestSend,
-    P2pChannelsRpcEffectfulResponseSend,
     P2pChannelsSignalingDiscoveryAnswerDecrypted,
     P2pChannelsSignalingDiscoveryAnswerReceived,
     P2pChannelsSignalingDiscoveryAnswerSend,
@@ -253,10 +245,6 @@ pub enum ActionKind {
     P2pChannelsSignalingDiscoveryReady,
     P2pChannelsSignalingDiscoveryRequestReceived,
     P2pChannelsSignalingDiscoveryRequestSend,
-    P2pChannelsSignalingDiscoveryEffectfulAnswerDecrypt,
-    P2pChannelsSignalingDiscoveryEffectfulInit,
-    P2pChannelsSignalingDiscoveryEffectfulMessageSend,
-    P2pChannelsSignalingDiscoveryEffectfulOfferEncryptAndSend,
     P2pChannelsSignalingExchangeAnswerReceived,
     P2pChannelsSignalingExchangeAnswerSend,
     P2pChannelsSignalingExchangeInit,
@@ -268,10 +256,6 @@ pub enum ActionKind {
     P2pChannelsSignalingExchangeReady,
     P2pChannelsSignalingExchangeRequestReceived,
     P2pChannelsSignalingExchangeRequestSend,
-    P2pChannelsSignalingExchangeEffectfulAnswerEncryptAndSend,
-    P2pChannelsSignalingExchangeEffectfulInit,
-    P2pChannelsSignalingExchangeEffectfulMessageSend,
-    P2pChannelsSignalingExchangeEffectfulOfferDecrypt,
     P2pChannelsSnarkInit,
     P2pChannelsSnarkLibp2pBroadcast,
     P2pChannelsSnarkLibp2pReceived,
@@ -282,9 +266,6 @@ pub enum ActionKind {
     P2pChannelsSnarkRequestReceived,
     P2pChannelsSnarkRequestSend,
     P2pChannelsSnarkResponseSend,
-    P2pChannelsSnarkEffectfulInit,
-    P2pChannelsSnarkEffectfulRequestSend,
-    P2pChannelsSnarkEffectfulResponseSend,
     P2pChannelsSnarkJobCommitmentInit,
     P2pChannelsSnarkJobCommitmentPending,
     P2pChannelsSnarkJobCommitmentPromiseReceived,
@@ -293,9 +274,6 @@ pub enum ActionKind {
     P2pChannelsSnarkJobCommitmentRequestReceived,
     P2pChannelsSnarkJobCommitmentRequestSend,
     P2pChannelsSnarkJobCommitmentResponseSend,
-    P2pChannelsSnarkJobCommitmentEffectfulInit,
-    P2pChannelsSnarkJobCommitmentEffectfulRequestSend,
-    P2pChannelsSnarkJobCommitmentEffectfulResponseSend,
     P2pChannelsStreamingRpcInit,
     P2pChannelsStreamingRpcPending,
     P2pChannelsStreamingRpcReady,
@@ -310,11 +288,6 @@ pub enum ActionKind {
     P2pChannelsStreamingRpcResponseSendInit,
     P2pChannelsStreamingRpcResponseSent,
     P2pChannelsStreamingRpcTimeout,
-    P2pChannelsStreamingRpcEffectfulInit,
-    P2pChannelsStreamingRpcEffectfulRequestSend,
-    P2pChannelsStreamingRpcEffectfulResponseNextPartGet,
-    P2pChannelsStreamingRpcEffectfulResponsePartSend,
-    P2pChannelsStreamingRpcEffectfulResponseSendInit,
     P2pChannelsTransactionInit,
     P2pChannelsTransactionLibp2pBroadcast,
     P2pChannelsTransactionLibp2pReceived,
@@ -325,9 +298,6 @@ pub enum ActionKind {
     P2pChannelsTransactionRequestReceived,
     P2pChannelsTransactionRequestSend,
     P2pChannelsTransactionResponseSend,
-    P2pChannelsTransactionEffectfulInit,
-    P2pChannelsTransactionEffectfulRequestSend,
-    P2pChannelsTransactionEffectfulResponseSend,
     P2pConnectionIncomingAnswerReady,
     P2pConnectionIncomingAnswerSdpCreateError,
     P2pConnectionIncomingAnswerSdpCreatePending,
@@ -718,7 +688,7 @@ pub enum ActionKind {
 }
 
 impl ActionKind {
-    pub const COUNT: u16 = 601;
+    pub const COUNT: u16 = 579;
 }
 
 impl std::fmt::Display for ActionKind {
@@ -1284,14 +1254,20 @@ impl ActionKindGet for P2pNetworkAction {
 impl ActionKindGet for P2pChannelsEffectfulAction {
     fn kind(&self) -> ActionKind {
         match self {
-            Self::SignalingDiscovery(a) => a.kind(),
-            Self::SignalingExchange(a) => a.kind(),
-            Self::BestTip(a) => a.kind(),
-            Self::Rpc(a) => a.kind(),
-            Self::Snark(a) => a.kind(),
-            Self::SnarkJobCommitment(a) => a.kind(),
-            Self::StreamingRpc(a) => a.kind(),
-            Self::Transaction(a) => a.kind(),
+            Self::InitChannel { .. } => ActionKind::P2pChannelsEffectfulInitChannel,
+            Self::MessageSend { .. } => ActionKind::P2pChannelsEffectfulMessageSend,
+            Self::SignalingDiscoveryAnswerDecrypt { .. } => {
+                ActionKind::P2pChannelsEffectfulSignalingDiscoveryAnswerDecrypt
+            }
+            Self::SignalingDiscoveryOfferEncryptAndSend { .. } => {
+                ActionKind::P2pChannelsEffectfulSignalingDiscoveryOfferEncryptAndSend
+            }
+            Self::SignalingExchangeOfferDecrypt { .. } => {
+                ActionKind::P2pChannelsEffectfulSignalingExchangeOfferDecrypt
+            }
+            Self::SignalingExchangeAnswerEncryptAndSend { .. } => {
+                ActionKind::P2pChannelsEffectfulSignalingExchangeAnswerEncryptAndSend
+            }
         }
     }
 }
@@ -1946,112 +1922,6 @@ impl ActionKindGet for P2pNetworkRpcAction {
     }
 }
 
-impl ActionKindGet for P2pChannelsSignalingDiscoveryEffectfulAction {
-    fn kind(&self) -> ActionKind {
-        match self {
-            Self::Init { .. } => ActionKind::P2pChannelsSignalingDiscoveryEffectfulInit,
-            Self::MessageSend { .. } => {
-                ActionKind::P2pChannelsSignalingDiscoveryEffectfulMessageSend
-            }
-            Self::OfferEncryptAndSend { .. } => {
-                ActionKind::P2pChannelsSignalingDiscoveryEffectfulOfferEncryptAndSend
-            }
-            Self::AnswerDecrypt { .. } => {
-                ActionKind::P2pChannelsSignalingDiscoveryEffectfulAnswerDecrypt
-            }
-        }
-    }
-}
-
-impl ActionKindGet for P2pChannelsSignalingExchangeEffectfulAction {
-    fn kind(&self) -> ActionKind {
-        match self {
-            Self::Init { .. } => ActionKind::P2pChannelsSignalingExchangeEffectfulInit,
-            Self::MessageSend { .. } => {
-                ActionKind::P2pChannelsSignalingExchangeEffectfulMessageSend
-            }
-            Self::OfferDecrypt { .. } => {
-                ActionKind::P2pChannelsSignalingExchangeEffectfulOfferDecrypt
-            }
-            Self::AnswerEncryptAndSend { .. } => {
-                ActionKind::P2pChannelsSignalingExchangeEffectfulAnswerEncryptAndSend
-            }
-        }
-    }
-}
-
-impl ActionKindGet for P2pChannelsBestTipEffectfulAction {
-    fn kind(&self) -> ActionKind {
-        match self {
-            Self::Init { .. } => ActionKind::P2pChannelsBestTipEffectfulInit,
-            Self::RequestSend { .. } => ActionKind::P2pChannelsBestTipEffectfulRequestSend,
-            Self::ResponseSend { .. } => ActionKind::P2pChannelsBestTipEffectfulResponseSend,
-        }
-    }
-}
-
-impl ActionKindGet for P2pChannelsRpcEffectfulAction {
-    fn kind(&self) -> ActionKind {
-        match self {
-            Self::Init { .. } => ActionKind::P2pChannelsRpcEffectfulInit,
-            Self::RequestSend { .. } => ActionKind::P2pChannelsRpcEffectfulRequestSend,
-            Self::ResponseSend { .. } => ActionKind::P2pChannelsRpcEffectfulResponseSend,
-        }
-    }
-}
-
-impl ActionKindGet for P2pChannelsSnarkEffectfulAction {
-    fn kind(&self) -> ActionKind {
-        match self {
-            Self::Init { .. } => ActionKind::P2pChannelsSnarkEffectfulInit,
-            Self::RequestSend { .. } => ActionKind::P2pChannelsSnarkEffectfulRequestSend,
-            Self::ResponseSend { .. } => ActionKind::P2pChannelsSnarkEffectfulResponseSend,
-        }
-    }
-}
-
-impl ActionKindGet for P2pChannelsSnarkJobCommitmentEffectfulAction {
-    fn kind(&self) -> ActionKind {
-        match self {
-            Self::Init { .. } => ActionKind::P2pChannelsSnarkJobCommitmentEffectfulInit,
-            Self::RequestSend { .. } => {
-                ActionKind::P2pChannelsSnarkJobCommitmentEffectfulRequestSend
-            }
-            Self::ResponseSend { .. } => {
-                ActionKind::P2pChannelsSnarkJobCommitmentEffectfulResponseSend
-            }
-        }
-    }
-}
-
-impl ActionKindGet for P2pChannelsStreamingRpcEffectfulAction {
-    fn kind(&self) -> ActionKind {
-        match self {
-            Self::Init { .. } => ActionKind::P2pChannelsStreamingRpcEffectfulInit,
-            Self::RequestSend { .. } => ActionKind::P2pChannelsStreamingRpcEffectfulRequestSend,
-            Self::ResponseNextPartGet { .. } => {
-                ActionKind::P2pChannelsStreamingRpcEffectfulResponseNextPartGet
-            }
-            Self::ResponseSendInit { .. } => {
-                ActionKind::P2pChannelsStreamingRpcEffectfulResponseSendInit
-            }
-            Self::ResponsePartSend { .. } => {
-                ActionKind::P2pChannelsStreamingRpcEffectfulResponsePartSend
-            }
-        }
-    }
-}
-
-impl ActionKindGet for P2pChannelsTransactionEffectfulAction {
-    fn kind(&self) -> ActionKind {
-        match self {
-            Self::Init { .. } => ActionKind::P2pChannelsTransactionEffectfulInit,
-            Self::RequestSend { .. } => ActionKind::P2pChannelsTransactionEffectfulRequestSend,
-            Self::ResponseSend { .. } => ActionKind::P2pChannelsTransactionEffectfulResponseSend,
-        }
-    }
-}
-
 impl ActionKindGet for P2pConnectionOutgoingEffectfulAction {
     fn kind(&self) -> ActionKind {
         match self {

node/src/logger/logger_effects.rs

@@ -1,7 +1,6 @@
 use openmina_core::log::inner::field::{display, DisplayValue};
 use openmina_core::log::inner::Value;
 use openmina_core::log::{time_to_str, ActionEvent, EventContext};
-use p2p::channels::P2pChannelsEffectfulAction;
 use p2p::connection::P2pConnectionEffectfulAction;
 use p2p::{P2pNetworkConnectionError, P2pNetworkSchedulerAction, PeerId};
 
@@ -106,22 +105,7 @@ pub fn logger_effects<S: Service>(store: &Store<S>, action: ActionWithMetaRef<'_
             },
         },
         Action::P2pEffectful(action) => match action {
-            p2p::P2pEffectfulAction::Channels(action) => match action {
-                P2pChannelsEffectfulAction::SignalingDiscovery(action) => {
-                    action.action_event(&context)
-                }
-                P2pChannelsEffectfulAction::SignalingExchange(action) => {
-                    action.action_event(&context)
-                }
-                P2pChannelsEffectfulAction::BestTip(action) => action.action_event(&context),
-                P2pChannelsEffectfulAction::Rpc(action) => action.action_event(&context),
-                P2pChannelsEffectfulAction::StreamingRpc(action) => action.action_event(&context),
-                P2pChannelsEffectfulAction::SnarkJobCommitment(action) => {
-                    action.action_event(&context)
-                }
-                P2pChannelsEffectfulAction::Snark(action) => action.action_event(&context),
-                P2pChannelsEffectfulAction::Transaction(action) => action.action_event(&context),
-            },
+            p2p::P2pEffectfulAction::Channels(action) => action.action_event(&context),
             p2p::P2pEffectfulAction::Connection(action) => match action {
                 P2pConnectionEffectfulAction::Outgoing(action) => action.action_event(&context),
                 P2pConnectionEffectfulAction::Incoming(action) => action.action_event(&context),

node/src/p2p/mod.rs

@@ -1,17 +1,6 @@
 pub use ::p2p::*;
 use p2p::{
-    channels::{
-        best_tip_effectful::P2pChannelsBestTipEffectfulAction,
-        rpc_effectful::P2pChannelsRpcEffectfulAction,
-        signaling::{
-            discovery_effectful::P2pChannelsSignalingDiscoveryEffectfulAction,
-            exchange_effectful::P2pChannelsSignalingExchangeEffectfulAction,
-        },
-        snark_effectful::P2pChannelsSnarkEffectfulAction,
-        snark_job_commitment_effectful::P2pChannelsSnarkJobCommitmentEffectfulAction,
-        streaming_rpc_effectful::P2pChannelsStreamingRpcEffectfulAction,
-        transaction_effectful::P2pChannelsTransactionEffectfulAction,
-    },
+    channels::P2pChannelsEffectfulAction,
     network::identify::stream_effectful::P2pNetworkIdentifyStreamEffectfulAction,
 };
 
@@ -138,17 +127,8 @@ impl_into_global_action!(effectful p2p::P2pNetworkPnetEffectfulAction);
 impl_into_global_action!(effectful connection::incoming_effectful::P2pConnectionIncomingEffectfulAction);
 impl_into_global_action!(effectful connection::outgoing_effectful::P2pConnectionOutgoingEffectfulAction);
 impl_into_global_action!(effectful p2p::disconnection_effectful::P2pDisconnectionEffectfulAction);
-impl_into_global_action!(
-    effectful P2pChannelsSignalingDiscoveryEffectfulAction
-);
-impl_into_global_action!(effectful P2pChannelsSignalingExchangeEffectfulAction);
-impl_into_global_action!(effectful P2pChannelsBestTipEffectfulAction);
-impl_into_global_action!(effectful P2pChannelsStreamingRpcEffectfulAction);
-impl_into_global_action!(effectful P2pChannelsTransactionEffectfulAction);
-impl_into_global_action!(effectful P2pChannelsSnarkJobCommitmentEffectfulAction);
-impl_into_global_action!(effectful P2pChannelsRpcEffectfulAction);
-impl_into_global_action!(effectful P2pChannelsSnarkEffectfulAction);
 impl_into_global_action!(effectful network::pubsub::P2pNetworkPubsubEffectfulAction);
 impl_into_global_action!(effectful P2pNetworkIdentifyStreamEffectfulAction);
+impl_into_global_action!(effectful P2pChannelsEffectfulAction);
 
 impl p2p::P2pActionTrait<crate::State> for crate::Action {}