When decide via sync skip commit timeout

informalsystems · Feb 7, 2025 · 7470351 · 7470351
1 parent 614a46c
commit 7470351
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/code/crates/core-consensus/src/handle/proposed_value.rs b/code/crates/core-consensus/src/handle/proposed_value.rs
@@ -1,5 +1,6 @@
 use crate::prelude::*;
 
+use crate::handle::decide::decide;
 use crate::handle::driver::apply_driver_input;
 use crate::types::ProposedValue;
 
@@ -78,5 +79,19 @@ where
         .await?;
     }
 
+    if origin == ValueOrigin::Sync && state.driver.step_is_commit() {
+        perform!(
+            co,
+            Effect::CancelTimeout(Timeout::commit(state.driver.round()), Default::default())
+        );
+        let height = state.driver.height();
+        let round = state.driver.round();
+        let proposal = state
+            .decision
+            .remove(&(height, round))
+            .ok_or_else(|| Error::DecidedValueNotFound(height, round))?;
+
+        decide(co, state, metrics, round, proposal).await?;
+    }
     Ok(())
 }
diff --git a/code/crates/core-consensus/src/handle/sync.rs b/code/crates/core-consensus/src/handle/sync.rs
@@ -1,3 +1,4 @@
+use crate::handle::decide::decide;
 use crate::handle::driver::apply_driver_input;
 use crate::handle::signature::verify_certificate;
 use crate::handle::validator_set::get_validator_set;
@@ -41,5 +42,21 @@ where
     )
     .await?;
 
+    if state.driver.step_is_commit() {
+        perform!(
+            co,
+            Effect::CancelTimeout(Timeout::commit(state.driver.round()), Default::default())
+        );
+
+        let height = state.driver.height();
+        let round = state.driver.round();
+        let proposal = state
+            .decision
+            .remove(&(height, round))
+            .ok_or_else(|| Error::DecidedValueNotFound(height, round))?;
+
+        decide(co, state, metrics, round, proposal).await?;
+    }
+
     Ok(())
 }