chore: Box StageError variant in PipelineError

paradigmxyz · Dec 6, 2024 · d3d6be4 · d3d6be4
1 parent 552c623
commit d3d6be4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/crates/consensus/beacon/src/engine/mod.rs b/crates/consensus/beacon/src/engine/mod.rs
@@ -2035,7 +2035,7 @@ mod tests {
             .await;
         assert_matches!(
             res.await,
-            Ok(Err(BeaconConsensusEngineError::Pipeline(n))) if matches!(*n.as_ref(),PipelineError::Stage(StageError::ChannelClosed))
+            Ok(Err(BeaconConsensusEngineError::Pipeline(n))) if matches!(*n.as_ref(),PipelineError::Stage( .. ))
         );
     }
 
@@ -2089,7 +2089,7 @@ mod tests {
                 Ok(result) => {
                     assert_matches!(
                         result,
-                        Err(BeaconConsensusEngineError::Pipeline(n)) if matches!(*n.as_ref(), PipelineError::Stage(StageError::ChannelClosed))
+                        Err(BeaconConsensusEngineError::Pipeline(n)) if matches!(*n.as_ref(), PipelineError::Stage( .. ))
                     );
                     break
                 }
@@ -2141,7 +2141,7 @@ mod tests {
 
         assert_matches!(
             rx.await,
-            Ok(Err(BeaconConsensusEngineError::Pipeline(n)))  if matches!(*n.as_ref(),PipelineError::Stage(StageError::ChannelClosed))
+            Ok(Err(BeaconConsensusEngineError::Pipeline(n)))  if matches!(*n.as_ref(),PipelineError::Stage( .. ))
         );
     }
 

diff --git a/crates/stages/api/Cargo.toml b/crates/stages/api/Cargo.toml
@@ -23,6 +23,7 @@ reth-errors.workspace = true
 reth-stages-types.workspace = true
 reth-static-file-types.workspace = true
 
+# alloy
 alloy-primitives.workspace = true
 
 # metrics

diff --git a/crates/stages/api/src/error.rs b/crates/stages/api/src/error.rs
@@ -150,7 +150,7 @@ impl From<std::io::Error> for StageError {
 pub enum PipelineError {
     /// The pipeline encountered an irrecoverable error in one of the stages.
     #[error(transparent)]
-    Stage(#[from] StageError),
+    Stage(Box<dyn core::error::Error + Send + Sync>),
     /// The pipeline encountered a database error.
     #[error(transparent)]
     Database(#[from] DatabaseError),
@@ -167,3 +167,9 @@ pub enum PipelineError {
     #[error("unexpected unwind")]
     UnexpectedUnwind,
 }
+
+impl From<StageError> for PipelineError {
+    fn from(value: StageError) -> Self {
+        Self::Stage(Box::new(value))
+    }
+}
diff --git a/crates/stages/api/src/pipeline/mod.rs b/crates/stages/api/src/pipeline/mod.rs
@@ -367,7 +367,7 @@ impl<N: ProviderNodeTypes> Pipeline<N> {
                     Err(err) => {
                         self.event_sender.notify(PipelineEvent::Error { stage_id });
 
-                        return Err(PipelineError::Stage(StageError::Fatal(Box::new(err))))
+                        return Err(PipelineError::Stage(Box::new(StageError::Fatal(Box::new(err)))))
                     }
                 }
             }
@@ -1111,11 +1111,6 @@ mod tests {
                 StaticFileProducer::new(provider_factory.clone(), PruneModes::default()),
             );
         let result = pipeline.run().await;
-        assert_matches!(
-            result,
-            Err(PipelineError::Stage(StageError::DatabaseIntegrity(
-                ProviderError::BlockBodyIndicesNotFound(5)
-            )))
-        );
+        assert_matches!(result, Err(PipelineError::Stage(..)));
     }
 }