refactor(snark_pool): Combine all action types of the snark_pool module into the parent action type

tizoc · tizoc · commit 29558b848d7f · 2024-02-01T15:20:02.000-03:00
diff --git a/node/src/effects.rs b/node/src/effects.rs
@@ -17,9 +17,7 @@ use crate::p2p::p2p_effects;
 use crate::rpc::rpc_effects;
 use crate::snark::snark_effects;
 use crate::snark_pool::candidate::SnarkPoolCandidateAction;
-use crate::snark_pool::{
-    snark_pool_effects, SnarkPoolCheckTimeoutsAction, SnarkPoolP2pSendAllAction,
-};
+use crate::snark_pool::{snark_pool_effects, SnarkPoolAction};
 use crate::transition_frontier::sync::TransitionFrontierSyncBlocksNextApplyInitAction;
 use crate::transition_frontier::transition_frontier_effects;
 use crate::watched_accounts::watched_accounts_effects;
@@ -50,8 +48,8 @@ pub fn effects<S: Service>(store: &mut Store<S>, action: ActionWithMeta) {
 
             p2p_try_reconnect_disconnected_peers(store);
 
-            store.dispatch(SnarkPoolCheckTimeoutsAction {});
-            store.dispatch(SnarkPoolP2pSendAllAction {});
+            store.dispatch(SnarkPoolAction::CheckTimeouts {});
+            store.dispatch(SnarkPoolAction::P2pSendAll {});
 
             p2p_request_best_tip_if_needed(store);
 
diff --git a/node/src/external_snark_worker/external_snark_worker_effects.rs b/node/src/external_snark_worker/external_snark_worker_effects.rs
@@ -1,6 +1,6 @@
 use openmina_core::snark::Snark;
 
-use crate::snark_pool::{SnarkPoolAutoCreateCommitmentAction, SnarkPoolWorkAddAction};
+use crate::snark_pool::SnarkPoolAction;
 
 use super::{
     available_job_to_snark_worker_spec, ExternalSnarkWorkerAction,
@@ -27,7 +27,7 @@ pub fn external_snark_worker_effects<S: crate::Service>(
             }
         }
         ExternalSnarkWorkerAction::Started => {
-            store.dispatch(SnarkPoolAutoCreateCommitmentAction {});
+            store.dispatch(SnarkPoolAction::AutoCreateCommitment {});
         }
         ExternalSnarkWorkerAction::StartTimeout { .. } => {
             store.dispatch(ExternalSnarkWorkerAction::Error {
@@ -78,7 +78,7 @@ pub fn external_snark_worker_effects<S: crate::Service>(
                 proofs: result.clone(),
             };
             let sender = store.state().p2p.my_id();
-            store.dispatch(SnarkPoolWorkAddAction { snark, sender });
+            store.dispatch(SnarkPoolAction::WorkAdd { snark, sender });
             store.dispatch(ExternalSnarkWorkerAction::PruneWork);
         }
         ExternalSnarkWorkerAction::WorkError { .. } => {
@@ -100,7 +100,7 @@ pub fn external_snark_worker_effects<S: crate::Service>(
             store.dispatch(ExternalSnarkWorkerAction::PruneWork);
         }
         ExternalSnarkWorkerAction::PruneWork => {
-            store.dispatch(SnarkPoolAutoCreateCommitmentAction {});
+            store.dispatch(SnarkPoolAction::AutoCreateCommitment {});
         }
     }
 }
diff --git a/node/src/p2p/p2p_effects.rs b/node/src/p2p/p2p_effects.rs
@@ -8,7 +8,7 @@ use crate::rpc::{
     RpcP2pConnectionOutgoingSuccessAction,
 };
 use crate::snark_pool::candidate::SnarkPoolCandidateAction;
-use crate::snark_pool::SnarkPoolJobCommitmentAddAction;
+use crate::snark_pool::SnarkPoolAction;
 use crate::transition_frontier::sync::ledger::snarked::{
     PeerLedgerQueryError, PeerLedgerQueryResponse,
     TransitionFrontierSyncLedgerSnarkedPeerQueryErrorAction,
@@ -348,7 +348,7 @@ pub fn p2p_effects<S: Service>(store: &mut Store<S>, action: P2pActionWithMeta)
                     commitment,
                 } = action
                 {
-                    store.dispatch(SnarkPoolJobCommitmentAddAction {
+                    store.dispatch(SnarkPoolAction::CommitmentAdd {
                         commitment,
                         sender: peer_id,
                     });
diff --git a/node/src/rpc/rpc_effects.rs b/node/src/rpc/rpc_effects.rs
@@ -7,7 +7,7 @@ use crate::p2p::connection::incoming::P2pConnectionIncomingInitAction;
 use crate::p2p::connection::outgoing::P2pConnectionOutgoingInitAction;
 use crate::p2p::connection::P2pConnectionResponse;
 use crate::rpc::{PeerConnectionStatus, RpcPeerInfo};
-use crate::snark_pool::SnarkPoolCommitmentCreateAction;
+use crate::snark_pool::SnarkPoolAction;
 use crate::{Service, Store};
 
 use super::{
@@ -369,7 +369,7 @@ pub fn rpc_effects<S: Service>(store: &mut Store<S>, action: RpcActionWithMeta)
             {
                 return;
             }
-            store.dispatch(SnarkPoolCommitmentCreateAction { job_id });
+            store.dispatch(SnarkPoolAction::CommitmentCreate { job_id });
         }
         RpcAction::SnarkerJobSpec(action) => {
             let job_id = action.job_id;
diff --git a/node/src/snark/snark_effects.rs b/node/src/snark/snark_effects.rs
@@ -1,6 +1,6 @@
 use crate::consensus::ConsensusAction;
 use crate::snark_pool::candidate::SnarkPoolCandidateAction;
-use crate::snark_pool::SnarkPoolWorkAddAction;
+use crate::snark_pool::SnarkPoolAction;
 use crate::{Service, Store};
 
 use super::block_verify::SnarkBlockVerifyAction;
@@ -50,7 +50,7 @@ pub fn snark_effects<S: Service>(store: &mut Store<S>, action: SnarkActionWithMe
                         verify_id: req_id,
                     });
                     for snark in batch {
-                        store.dispatch(SnarkPoolWorkAddAction { snark, sender });
+                        store.dispatch(SnarkPoolAction::WorkAdd { snark, sender });
                     }
                 }
                 SnarkWorkVerifyAction::Init { .. } => {}
diff --git a/node/src/snark_pool/snark_pool_actions.rs b/node/src/snark_pool/snark_pool_actions.rs
@@ -11,173 +11,102 @@ use super::SnarkWork;
 pub type SnarkPoolActionWithMeta = redux::ActionWithMeta<SnarkPoolAction>;
 pub type SnarkPoolActionWithMetaRef<'a> = redux::ActionWithMeta<&'a SnarkPoolAction>;
 
-#[derive(derive_more::From, Serialize, Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub enum SnarkPoolAction {
     Candidate(SnarkPoolCandidateAction),
 
-    JobsUpdate(SnarkPoolJobsUpdateAction),
-    AutoCreateCommitment(SnarkPoolAutoCreateCommitmentAction),
-    CommitmentCreate(SnarkPoolCommitmentCreateAction),
-    CommitmentAdd(SnarkPoolJobCommitmentAddAction),
-    WorkAdd(SnarkPoolWorkAddAction),
-    P2pSendAll(SnarkPoolP2pSendAllAction),
-    P2pSend(SnarkPoolP2pSendAction),
-    CheckTimeouts(SnarkPoolCheckTimeoutsAction),
-    JobCommitmentTimeout(SnarkPoolJobCommitmentTimeoutAction),
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct SnarkPoolJobsUpdateAction {
-    pub jobs: Vec<OneOrTwo<AvailableJobMessage>>,
-    pub orphaned_snarks: Vec<SnarkWork>,
-}
-
-impl redux::EnablingCondition<crate::State> for SnarkPoolJobsUpdateAction {}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct SnarkPoolAutoCreateCommitmentAction {}
-
-impl redux::EnablingCondition<crate::State> for SnarkPoolAutoCreateCommitmentAction {
-    fn is_enabled(&self, #[allow(unused_variables)] state: &crate::State) -> bool {
-        state
-            .config
-            .snarker
-            .as_ref()
-            .map_or(false, |v| v.auto_commit)
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct SnarkPoolCommitmentCreateAction {
-    pub job_id: SnarkJobId,
-}
-
-impl redux::EnablingCondition<crate::State> for SnarkPoolCommitmentCreateAction {
-    fn is_enabled(&self, state: &crate::State) -> bool {
-        state.config.snarker.is_some() && state.snark_pool.should_create_commitment(&self.job_id)
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct SnarkPoolJobCommitmentAddAction {
-    pub commitment: SnarkJobCommitment,
-    pub sender: PeerId,
+    JobsUpdate {
+        jobs: Vec<OneOrTwo<AvailableJobMessage>>,
+        orphaned_snarks: Vec<SnarkWork>,
+    },
+    AutoCreateCommitment,
+    CommitmentCreate {
+        job_id: SnarkJobId,
+    },
+    CommitmentAdd {
+        commitment: SnarkJobCommitment,
+        sender: PeerId,
+    },
+    WorkAdd {
+        snark: Snark,
+        sender: PeerId,
+    },
+    P2pSendAll,
+    P2pSend {
+        peer_id: PeerId,
+    },
+    CheckTimeouts,
+    JobCommitmentTimeout {
+        job_id: SnarkJobId,
+    },
 }
 
-impl redux::EnablingCondition<crate::State> for SnarkPoolJobCommitmentAddAction {
+impl redux::EnablingCondition<crate::State> for SnarkPoolAction {
     fn is_enabled(&self, state: &crate::State) -> bool {
-        state
-            .snark_pool
-            .get(&self.commitment.job_id)
-            .map_or(false, |s| match s.commitment.as_ref() {
-                Some(cur) => self.commitment > cur.commitment,
-                None => true,
-            })
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct SnarkPoolWorkAddAction {
-    pub snark: Snark,
-    pub sender: PeerId,
-}
-
-impl redux::EnablingCondition<crate::State> for SnarkPoolWorkAddAction {
-    fn is_enabled(&self, state: &crate::State) -> bool {
-        state
-            .snark_pool
-            .get(&self.snark.job_id())
-            .map_or(false, |s| match s.snark.as_ref() {
-                Some(cur) => self.snark > cur.work,
-                None => true,
-            })
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct SnarkPoolP2pSendAllAction {}
-
-impl redux::EnablingCondition<crate::State> for SnarkPoolP2pSendAllAction {}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct SnarkPoolP2pSendAction {
-    pub peer_id: PeerId,
-}
-
-impl redux::EnablingCondition<crate::State> for SnarkPoolP2pSendAction {
-    fn is_enabled(&self, state: &crate::State) -> bool {
-        state
-            .p2p
-            .get_ready_peer(&self.peer_id)
-            // Only send commitments/snarks if peer has the same best tip,
-            // or its best tip is extension of our best tip. In such case
-            // no commitment/snark will be dropped by peer, because it
-            // doesn't yet have those jobs.
-            //
-            // By sending commitments/snarks to the peer, which has next
-            // best tip, we might send outdated commitments/snarks, but
-            // we might send useful ones as well.
-            .and_then(|p| {
-                let peer_best_tip = p.best_tip.as_ref()?;
-                let our_best_tip = state.transition_frontier.best_tip()?.hash();
-                Some(p).filter(|_| {
-                    peer_best_tip.hash() == our_best_tip
-                        || peer_best_tip.pred_hash() == our_best_tip
-                })
-            })
-            .map_or(false, |p| {
-                let check = |(next_index, limit), last_index| limit > 0 && next_index <= last_index;
-                let last_index = state.snark_pool.last_index();
-
-                check(
-                    p.channels.snark_job_commitment.next_send_index_and_limit(),
-                    last_index,
-                ) || check(p.channels.snark.next_send_index_and_limit(), last_index)
-            })
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct SnarkPoolCheckTimeoutsAction {}
-
-impl redux::EnablingCondition<crate::State> for SnarkPoolCheckTimeoutsAction {
-    fn is_enabled(&self, state: &crate::State) -> bool {
-        state
-            .time()
-            .checked_sub(state.snark_pool.last_check_timeouts)
-            .map_or(false, |dur| dur.as_secs() >= 5)
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct SnarkPoolJobCommitmentTimeoutAction {
-    pub job_id: SnarkJobId,
-}
-
-impl redux::EnablingCondition<crate::State> for SnarkPoolJobCommitmentTimeoutAction {
-    fn is_enabled(&self, state: &crate::State) -> bool {
-        state
-            .snark_pool
-            .is_commitment_timed_out(&self.job_id, state.time())
-    }
-}
-
-macro_rules! impl_into_global_action {
-    ($a:ty) => {
-        impl From<$a> for crate::Action {
-            fn from(value: $a) -> Self {
-                Self::SnarkPool(value.into())
+        match self {
+            SnarkPoolAction::Candidate(action) => action.is_enabled(state),
+            SnarkPoolAction::AutoCreateCommitment => state
+                .config
+                .snarker
+                .as_ref()
+                .map_or(false, |v| v.auto_commit),
+            SnarkPoolAction::CommitmentCreate { job_id } => {
+                state.config.snarker.is_some() && state.snark_pool.should_create_commitment(job_id)
+            }
+            SnarkPoolAction::CommitmentAdd { commitment, .. } => state
+                .snark_pool
+                .get(&commitment.job_id)
+                .map_or(false, |s| match s.commitment.as_ref() {
+                    Some(cur) => commitment > &cur.commitment,
+                    None => true,
+                }),
+            SnarkPoolAction::WorkAdd { snark, .. } => {
+                state
+                    .snark_pool
+                    .get(&snark.job_id())
+                    .map_or(false, |s| match s.snark.as_ref() {
+                        Some(cur) => snark > &cur.work,
+                        None => true,
+                    })
             }
+            SnarkPoolAction::P2pSend { peer_id } => state
+                .p2p
+                .get_ready_peer(peer_id)
+                // Only send commitments/snarks if peer has the same best tip,
+                // or its best tip is extension of our best tip. In such case
+                // no commitment/snark will be dropped by peer, because it
+                // doesn't yet have those jobs.
+                //
+                // By sending commitments/snarks to the peer, which has next
+                // best tip, we might send outdated commitments/snarks, but
+                // we might send useful ones as well.
+                .and_then(|p| {
+                    let peer_best_tip = p.best_tip.as_ref()?;
+                    let our_best_tip = state.transition_frontier.best_tip()?.hash();
+                    Some(p).filter(|_| {
+                        peer_best_tip.hash() == our_best_tip
+                            || peer_best_tip.pred_hash() == our_best_tip
+                    })
+                })
+                .map_or(false, |p| {
+                    let check =
+                        |(next_index, limit), last_index| limit > 0 && next_index <= last_index;
+                    let last_index = state.snark_pool.last_index();
+
+                    check(
+                        p.channels.snark_job_commitment.next_send_index_and_limit(),
+                        last_index,
+                    ) || check(p.channels.snark.next_send_index_and_limit(), last_index)
+                }),
+            SnarkPoolAction::CheckTimeouts => state
+                .time()
+                .checked_sub(state.snark_pool.last_check_timeouts)
+                .map_or(false, |dur| dur.as_secs() >= 5),
+            SnarkPoolAction::JobCommitmentTimeout { job_id } => state
+                .snark_pool
+                .is_commitment_timed_out(job_id, state.time()),
+            SnarkPoolAction::JobsUpdate { .. } => true,
+            SnarkPoolAction::P2pSendAll => true,
         }
-    };
+    }
 }
-
-impl_into_global_action!(SnarkPoolJobsUpdateAction);
-impl_into_global_action!(SnarkPoolAutoCreateCommitmentAction);
-impl_into_global_action!(SnarkPoolCommitmentCreateAction);
-impl_into_global_action!(SnarkPoolJobCommitmentAddAction);
-impl_into_global_action!(SnarkPoolWorkAddAction);
-impl_into_global_action!(SnarkPoolP2pSendAllAction);
-impl_into_global_action!(SnarkPoolP2pSendAction);
-impl_into_global_action!(SnarkPoolCheckTimeoutsAction);
-impl_into_global_action!(SnarkPoolJobCommitmentTimeoutAction);
diff --git a/node/src/snark_pool/snark_pool_effects.rs b/node/src/snark_pool/snark_pool_effects.rs
diff --git a/node/src/snark_pool/snark_pool_reducer.rs b/node/src/snark_pool/snark_pool_reducer.rs
diff --git a/node/src/transition_frontier/transition_frontier_effects.rs b/node/src/transition_frontier/transition_frontier_effects.rs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`use openmina_core::snark::Snark;`
`2`	`2`
`3`		`-use crate::snark_pool::{SnarkPoolAutoCreateCommitmentAction, SnarkPoolWorkAddAction};`
	`3`	`+use crate::snark_pool::SnarkPoolAction;`
`4`	`4`
`5`	`5`	`use super::{`
`6`	`6`	`available_job_to_snark_worker_spec, ExternalSnarkWorkerAction,`
`@@ -27,7 +27,7 @@ pub fn external_snark_worker_effects<S: crate::Service>(`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`	`ExternalSnarkWorkerAction::Started => {`
`30`		`- store.dispatch(SnarkPoolAutoCreateCommitmentAction {});`
	`30`	`+ store.dispatch(SnarkPoolAction::AutoCreateCommitment {});`
`31`	`31`	`}`
`32`	`32`	`ExternalSnarkWorkerAction::StartTimeout { .. } => {`
`33`	`33`	`store.dispatch(ExternalSnarkWorkerAction::Error {`
`@@ -78,7 +78,7 @@ pub fn external_snark_worker_effects<S: crate::Service>(`
`78`	`78`	`proofs: result.clone(),`
`79`	`79`	`};`
`80`	`80`	`let sender = store.state().p2p.my_id();`
`81`		`- store.dispatch(SnarkPoolWorkAddAction { snark, sender });`
	`81`	`+ store.dispatch(SnarkPoolAction::WorkAdd { snark, sender });`
`82`	`82`	`store.dispatch(ExternalSnarkWorkerAction::PruneWork);`
`83`	`83`	`}`
`84`	`84`	`ExternalSnarkWorkerAction::WorkError { .. } => {`
`@@ -100,7 +100,7 @@ pub fn external_snark_worker_effects<S: crate::Service>(`
`100`	`100`	`store.dispatch(ExternalSnarkWorkerAction::PruneWork);`
`101`	`101`	`}`
`102`	`102`	`ExternalSnarkWorkerAction::PruneWork => {`
`103`		`- store.dispatch(SnarkPoolAutoCreateCommitmentAction {});`
	`103`	`+ store.dispatch(SnarkPoolAction::AutoCreateCommitment {});`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ use crate::p2p::connection::incoming::P2pConnectionIncomingInitAction;`
`7`	`7`	`use crate::p2p::connection::outgoing::P2pConnectionOutgoingInitAction;`
`8`	`8`	`use crate::p2p::connection::P2pConnectionResponse;`
`9`	`9`	`use crate::rpc::{PeerConnectionStatus, RpcPeerInfo};`
`10`		`-use crate::snark_pool::SnarkPoolCommitmentCreateAction;`
	`10`	`+use crate::snark_pool::SnarkPoolAction;`
`11`	`11`	`use crate::{Service, Store};`
`12`	`12`
`13`	`13`	`use super::{`
`@@ -369,7 +369,7 @@ pub fn rpc_effects<S: Service>(store: &mut Store<S>, action: RpcActionWithMeta)`
`369`	`369`	`{`
`370`	`370`	`return;`
`371`	`371`	`}`
`372`		`- store.dispatch(SnarkPoolCommitmentCreateAction { job_id });`
	`372`	`+ store.dispatch(SnarkPoolAction::CommitmentCreate { job_id });`
`373`	`373`	`}`
`374`	`374`	`RpcAction::SnarkerJobSpec(action) => {`
`375`	`375`	`let job_id = action.job_id;`