fixes after merge

Author: jonastheis

crates/engine/src/error.rs

@@ -37,43 +37,3 @@ impl EngineError {
         Self::FcsError(FcsError::FinalizedBlockNumberNotIncreasing)
     }
 }
-
-/// The error type for the fork choice state.
-#[derive(Debug, thiserror::Error)]
-pub enum FcsError {
-    /// No update was provided for head, safe or finalized.
-    #[error("No update provided for head, safe or finalized")]
-    NoUpdateProvided,
-    /// Finalized block number not increasing.
-    #[error("Finalized block number not increasing")]
-    FinalizedBlockNumberNotIncreasing,
-    /// Head block number cannot be below safe block number.
-    #[error("Safe block number can not be below the head block number")]
-    HeadBelowSafe,
-    /// Safe block number cannot be below finalized block number.
-    #[error("Safe block number can not be below the finalized block number")]
-    SafeBelowFinalized,
-}
-
-/// The error type for the Engine.
-#[derive(Debug, thiserror::Error)]
-pub enum EngineError {
-    /// An error occurred in the fork choice state.
-    #[error("Fork choice state error: {0}")]
-    FcsError(#[from] FcsError),
-    /// An error occurred in the transport layer.
-    #[error("Transport error: {0}")]
-    TransportError(#[from] scroll_alloy_provider::ScrollEngineApiError),
-}
-
-impl EngineError {
-    /// Creates a new [`EngineError`] for a [`FcsError::NoUpdateProvided`].
-    pub const fn fcs_no_update_provided() -> Self {
-        Self::FcsError(FcsError::NoUpdateProvided)
-    }
-
-    /// Creates a new [`EngineError`] for a [`FcsError::FinalizedBlockNumberNotIncreasing`].
-    pub const fn fcs_finalized_block_number_not_increasing() -> Self {
-        Self::FcsError(FcsError::FinalizedBlockNumberNotIncreasing)
-    }
-}

crates/node/tests/e2e.rs

@@ -1030,7 +1030,7 @@ async fn shutdown_consolidates_most_recent_batch_on_startup() -> eyre::Result<()
         if let Some(ChainOrchestratorEvent::BlockConsolidated(consolidation_outcome)) =
             rnm_events.next().await
         {
-            break *consolidation_outcome.block_info();
+            break consolidation_outcome.block_info().clone();
         }
     };
 
@@ -1049,7 +1049,7 @@ async fn shutdown_consolidates_most_recent_batch_on_startup() -> eyre::Result<()
             if let Some(ChainOrchestratorEvent::BlockConsolidated(consolidation_outcome)) =
                 rnm_events.next().await
             {
-                assert!(consolidation_outcome.block_info().number == i);
+                assert!(consolidation_outcome.block_info().block_info.number == i);
                 break;
             }
         }
@@ -1263,7 +1263,7 @@ async fn can_handle_batch_revert() -> eyre::Result<()> {
         if let Some(ChainOrchestratorEvent::BlockConsolidated(consolidation_outcome)) =
             rnm_events.next().await
         {
-            if consolidation_outcome.block_info().number == 4 {
+            if consolidation_outcome.block_info().block_info.number == 4 {
                 break
             }
         }
@@ -1277,7 +1277,7 @@ async fn can_handle_batch_revert() -> eyre::Result<()> {
         if let Some(ChainOrchestratorEvent::BlockConsolidated(consolidation_outcome)) =
             rnm_events.next().await
         {
-            if consolidation_outcome.block_info().number == 46 {
+            if consolidation_outcome.block_info().block_info.number == 46 {
                 break
             }
         }