apollo_consensus: fix conflicts

Author: dafnamatsry

crates/apollo_consensus/src/manager.rs

@@ -433,9 +433,7 @@ impl<ContextT: ConsensusContext> MultiHeightManager<ContextT> {
                     self.wait_until_sync_reaches_height(height, context).await;
                     RunHeightRes::Sync
                 }
-                e @ ConsensusError::BlockInfoConversion(_)
-                | e @ ConsensusError::InternalNetworkError(_)
-                | e @ ConsensusError::Other(_) => {
+                e @ ConsensusError::InternalNetworkError(_) => {
                     // The node is missing required components/data and cannot continue
                     // participating in the consensus. A fix and node restart are required.
                     return Err(e);

crates/apollo_consensus/src/types.rs

@@ -154,8 +154,4 @@ pub enum ConsensusError {
     // As opposed to an error between this node and peer nodes.
     #[error("{0}")]
     InternalNetworkError(String),
-    #[error("Block info conversion error: {0}")]
-    BlockInfoConversion(#[from] starknet_api::StarknetApiError),
-    #[error("{0}")]
-    Other(String),
 }