sync when justified block is not found

tari-project · Jan 12, 2024 · bf225dc · bf225dc
1 parent ce1f235
commit bf225dc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git a/dan_layer/consensus/src/hotstuff/on_receive_local_proposal.rs b/dan_layer/consensus/src/hotstuff/on_receive_local_proposal.rs
@@ -137,6 +137,13 @@ impl<TConsensusSpec: ConsensusSpec> OnReceiveLocalProposalHandler<TConsensusSpec
         self.store.with_write_tx(|tx| {
             match self.validate_local_proposed_block(tx, block, &local_committee, &local_committee_shard) {
                 Ok(validated) => Ok(Some(validated)),
+                // Propagate this error out as sync is needed in the case where we have a valid QC but do not know the
+                // block
+                Err(
+                    err @ HotStuffError::ProposalValidationError(ProposalValidationError::JustifyBlockNotFound {
+                        ..
+                    }),
+                ) => Err(err),
                 // Validation errors should not cause a FAILURE state transition
                 Err(HotStuffError::ProposalValidationError(err)) => {
                     warn!(target: LOG_TARGET, "❌ Block failed validation: {}", err);

diff --git a/dan_layer/consensus/src/hotstuff/pacemaker_handle.rs b/dan_layer/consensus/src/hotstuff/pacemaker_handle.rs
@@ -98,18 +98,6 @@ impl PaceMakerHandle {
             .map_err(|e| HotStuffError::PacemakerChannelDropped { details: e.to_string() })
     }
 
-    pub async fn reset_view(
-        &self,
-        last_seen_height: NodeHeight,
-        high_qc_height: NodeHeight,
-    ) -> Result<(), HotStuffError> {
-        self.current_height.set(last_seen_height);
-        self.sender
-            .send(PacemakerRequest::ResetLeaderTimeout { high_qc_height })
-            .await
-            .map_err(|e| HotStuffError::PacemakerChannelDropped { details: e.to_string() })
-    }
-
     pub fn current_height(&self) -> NodeHeight {
         self.current_height.get()
     }

diff --git a/dan_layer/consensus/src/hotstuff/worker.rs b/dan_layer/consensus/src/hotstuff/worker.rs
@@ -494,10 +494,6 @@ where TConsensusSpec: ConsensusSpec
             self.pacemaker.current_height()
         );
 
-        self.pacemaker
-            .reset_view(high_qc.block_height(), high_qc.block_height())
-            .await?;
-
         let current_epoch = self.epoch_manager.current_epoch().await?;
         // Send the request message
         if self