consensus: do not call collect_from_past for Candidate

dusk-network · Aug 22, 2024 · 1c628ea · 1c628ea
1 parent 13fea3e
commit 1c628ea
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 40 deletions.
diff --git a/consensus/src/execution_ctx.rs b/consensus/src/execution_ctx.rs
@@ -248,44 +248,45 @@ impl<'a, DB: Database, T: Operations + 'static> ExecutionCtx<'a, DB, T> {
     async fn on_emergency_mode(&mut self, msg: Message) {
         self.outbound.try_send(msg.clone());
 
-        // Try to cast validation vote for a candidate block from former
-        // iteration
+        // Try to vote for a candidate block from former iteration
         if let Payload::Candidate(p) = &msg.payload {
             self.try_cast_validation_vote(&p.candidate).await;
         }
-
-        let msg_iteration = msg.header.iteration;
-
-        // Collect message from a previous iteration/step.
-        if let Some(m) = self
-            .iter_ctx
-            .collect_past_event(&self.round_update, msg)
-            .await
-        {
-            match &m.payload {
-                Payload::Quorum(q) => {
-                    debug!(
-                        event = "quorum",
-                        src = "prev_step",
-                        msg_step = m.get_step(),
-                        vote = ?q.vote(),
-                    );
-
-                    self.quorum_sender.send_quorum(m).await;
-                }
-
-                Payload::ValidationResult(validation_result) => {
-                    self.try_cast_ratification_vote(
-                        msg_iteration,
-                        validation_result,
-                    )
-                    .await
-                }
-                _ => {
-                    // Not supported.
-                }
-            }
+        else {
+          let msg_iteration = msg.header.iteration;
+
+          // Collect message from a previous iteration/step.
+          if let Some(m) = self
+              .iter_ctx
+              .collect_past_event(&self.round_update, msg)
+              .await
+          {
+              match &m.payload {
+                  Payload::Quorum(q) => {
+                      debug!(
+                          event = "quorum",
+                          src = "prev_step",
+                          msg_step = m.get_step(),
+                          vote = ?q.vote(),
+                      );
+
+                      self.quorum_sender.send_quorum(m).await;
+                  }
+
+                  Payload::ValidationResult(validation_result) => {
+                      self.try_cast_ratification_vote(
+                          msg_iteration,
+                          validation_result,
+                      )
+                      .await
+                  }
+                  _ => {
+                      // Not supported.
+                  }
+              }
+          }
         }
+
     }
 
     /// Delegates the received message to the Phase handler for further

diff --git a/consensus/src/iteration_ctx.rs b/consensus/src/iteration_ctx.rs
@@ -152,12 +152,6 @@ impl<D: Database> IterationCtx<D> {
         let generator = self.get_generator(msg.header.iteration);
 
         match msg.topic() {
-            node_data::message::Topics::Candidate => {
-                let mut handler = self.proposal_handler.lock().await;
-                _ = handler
-                    .collect_from_past(msg, ru, committee, generator)
-                    .await;
-            }
             node_data::message::Topics::Validation => {
                 let mut handler = self.validation_handler.lock().await;
                 if let Ok(HandleMsgOutput::Ready(m)) = handler