Removed state access from effectful effects

Author: 0xMimir

node/src/action_kind.rs

@@ -333,6 +333,7 @@ pub enum ActionKind {
     P2pNetworkSchedulerDisconnected,
     P2pNetworkSchedulerError,
     P2pNetworkSchedulerIncomingDataDidReceive,
+    P2pNetworkSchedulerIncomingDataIsReady,
     P2pNetworkSchedulerIncomingDidAccept,
     P2pNetworkSchedulerInterfaceDetected,
     P2pNetworkSchedulerInterfaceExpired,
@@ -344,16 +345,17 @@ pub enum ActionKind {
     P2pNetworkSchedulerPruneStream,
     P2pNetworkSchedulerPruneStreams,
     P2pNetworkSchedulerSelectDone,
+    P2pNetworkSchedulerSelectError,
     P2pNetworkSchedulerYamuxDidInit,
     P2pNetworkSchedulerEffectfulDisconnect,
     P2pNetworkSchedulerEffectfulError,
     P2pNetworkSchedulerEffectfulIncomingConnectionIsReady,
     P2pNetworkSchedulerEffectfulIncomingDataIsReady,
     P2pNetworkSchedulerEffectfulIncomingDidAccept,
     P2pNetworkSchedulerEffectfulInterfaceDetected,
+    P2pNetworkSchedulerEffectfulNoiseSelectDone,
     P2pNetworkSchedulerEffectfulOutgoingConnect,
     P2pNetworkSchedulerEffectfulOutgoingDidConnect,
-    P2pNetworkSchedulerEffectfulSelectDone,
     P2pNetworkSchedulerEffectfulSelectError,
     P2pNetworkSelectIncomingData,
     P2pNetworkSelectIncomingDataAuth,
@@ -556,7 +558,7 @@ pub enum ActionKind {
 }
 
 impl ActionKind {
-    pub const COUNT: u16 = 461;
+    pub const COUNT: u16 = 463;
 }
 
 impl std::fmt::Display for ActionKind {
@@ -1381,12 +1383,14 @@ impl ActionKindGet for P2pNetworkSchedulerAction {
             Self::ListenerReady { .. } => ActionKind::P2pNetworkSchedulerListenerReady,
             Self::ListenerError { .. } => ActionKind::P2pNetworkSchedulerListenerError,
             Self::IncomingDidAccept { .. } => ActionKind::P2pNetworkSchedulerIncomingDidAccept,
+            Self::IncomingDataIsReady { .. } => ActionKind::P2pNetworkSchedulerIncomingDataIsReady,
             Self::OutgoingConnect { .. } => ActionKind::P2pNetworkSchedulerOutgoingConnect,
             Self::OutgoingDidConnect { .. } => ActionKind::P2pNetworkSchedulerOutgoingDidConnect,
             Self::IncomingDataDidReceive { .. } => {
                 ActionKind::P2pNetworkSchedulerIncomingDataDidReceive
             }
             Self::SelectDone { .. } => ActionKind::P2pNetworkSchedulerSelectDone,
+            Self::SelectError { .. } => ActionKind::P2pNetworkSchedulerSelectError,
             Self::YamuxDidInit { .. } => ActionKind::P2pNetworkSchedulerYamuxDidInit,
             Self::Disconnect { .. } => ActionKind::P2pNetworkSchedulerDisconnect,
             Self::Error { .. } => ActionKind::P2pNetworkSchedulerError,
@@ -1417,7 +1421,7 @@ impl ActionKindGet for P2pNetworkSchedulerEffectfulAction {
             Self::IncomingDataIsReady { .. } => {
                 ActionKind::P2pNetworkSchedulerEffectfulIncomingDataIsReady
             }
-            Self::SelectDone { .. } => ActionKind::P2pNetworkSchedulerEffectfulSelectDone,
+            Self::NoiseSelectDone { .. } => ActionKind::P2pNetworkSchedulerEffectfulNoiseSelectDone,
             Self::SelectError { .. } => ActionKind::P2pNetworkSchedulerEffectfulSelectError,
             Self::Disconnect { .. } => ActionKind::P2pNetworkSchedulerEffectfulDisconnect,
             Self::Error { .. } => ActionKind::P2pNetworkSchedulerEffectfulError,

node/src/event_source/event_source_effects.rs

@@ -93,9 +93,7 @@ pub fn event_source_effects<S: Service>(store: &mut Store<S>, action: EventSourc
                         });
                     }
                     MioEvent::IncomingDataIsReady(addr) => {
-                        store.dispatch(P2pNetworkSchedulerEffectfulAction::IncomingDataIsReady {
-                            addr,
-                        });
+                        store.dispatch(P2pNetworkSchedulerAction::IncomingDataIsReady { addr });
                     }
                     MioEvent::IncomingDataDidReceive(addr, result) => {
                         store.dispatch(P2pNetworkSchedulerAction::IncomingDataDidReceive {

p2p/src/network/scheduler/p2p_network_scheduler_actions.rs

@@ -37,6 +37,9 @@ pub enum P2pNetworkSchedulerAction {
         addr: Option<ConnectionAddr>,
         result: Result<(), String>,
     },
+    IncomingDataIsReady {
+        addr: ConnectionAddr,
+    },
     /// Initialize outgoing connection.
     OutgoingConnect {
         addr: SocketAddr,
@@ -57,6 +60,11 @@ pub enum P2pNetworkSchedulerAction {
         incoming: bool,
         expected_peer_id: Option<PeerId>,
     },
+    SelectError {
+        addr: ConnectionAddr,
+        kind: SelectKind,
+        error: String,
+    },
     YamuxDidInit {
         addr: ConnectionAddr,
         peer_id: PeerId,
@@ -113,14 +121,15 @@ impl From<P2pNetworkSchedulerAction> for crate::P2pAction {
 
 impl redux::EnablingCondition<P2pState> for P2pNetworkSchedulerAction {
     fn is_enabled(&self, state: &P2pState, _time: redux::Timestamp) -> bool {
-        let conn = |addr| state.network.scheduler.connections.get(addr);
-        #[allow(unused_variables)]
         match self {
-            P2pNetworkSchedulerAction::InterfaceDetected { ip } => true,
-            P2pNetworkSchedulerAction::InterfaceExpired { ip } => true,
-            P2pNetworkSchedulerAction::ListenerReady { listener } => true,
-            P2pNetworkSchedulerAction::ListenerError { listener, error } => true,
-            P2pNetworkSchedulerAction::IncomingDidAccept { addr, result } => {
+            P2pNetworkSchedulerAction::InterfaceDetected { .. }
+            | P2pNetworkSchedulerAction::InterfaceExpired { .. }
+            | P2pNetworkSchedulerAction::ListenerReady { .. }
+            | P2pNetworkSchedulerAction::ListenerError { .. }
+            | P2pNetworkSchedulerAction::SelectDone { .. }
+            | P2pNetworkSchedulerAction::SelectError { .. }
+            | P2pNetworkSchedulerAction::YamuxDidInit { .. } => true,
+            P2pNetworkSchedulerAction::IncomingDidAccept { addr, .. } => {
                 addr.as_ref().map_or(false, |addr| {
                     !state.network.scheduler.connections.contains_key(addr)
                 })
@@ -133,23 +142,16 @@ impl redux::EnablingCondition<P2pState> for P2pNetworkSchedulerAction {
                     sock_addr: *addr,
                     incoming: false,
                 }),
-            P2pNetworkSchedulerAction::OutgoingDidConnect { addr, result } => state
+            P2pNetworkSchedulerAction::OutgoingDidConnect { addr, .. } => state
                 .network
                 .scheduler
                 .connections
                 .get(addr)
                 .map_or(false, |conn_state| !conn_state.incoming),
-            P2pNetworkSchedulerAction::IncomingDataDidReceive { addr, result } => {
-                conn(addr).is_some()
+            P2pNetworkSchedulerAction::IncomingDataDidReceive { addr, .. }
+            | P2pNetworkSchedulerAction::IncomingDataIsReady { addr } => {
+                state.network.scheduler.connections.contains_key(addr)
             }
-            P2pNetworkSchedulerAction::SelectDone {
-                addr,
-                kind,
-                protocol,
-                incoming,
-                expected_peer_id,
-            } => true,
-            P2pNetworkSchedulerAction::YamuxDidInit { addr, peer_id, .. } => true,
             P2pNetworkSchedulerAction::Disconnect { addr, .. }
             | P2pNetworkSchedulerAction::Error { addr, .. } => state
                 .network