From 409c15dde45d4256537b231ca833fddd79dafdfd Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Tue, 28 May 2024 19:05:47 +0200
Subject: [PATCH] chore: rm reth error variant (#8440)

---
 .../beacon/src/engine/hooks/prune.rs          |  1 -
 crates/prune/src/error.rs                     |  5 +----
 crates/prune/src/segments/mod.rs              | 20 +++++++++----------
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/crates/consensus/beacon/src/engine/hooks/prune.rs b/crates/consensus/beacon/src/engine/hooks/prune.rs
index d2c2e2d33a..ea9078aca9 100644
--- a/crates/consensus/beacon/src/engine/hooks/prune.rs
+++ b/crates/consensus/beacon/src/engine/hooks/prune.rs
@@ -169,7 +169,6 @@ impl From<PrunerError> for EngineHookError {
             PrunerError::PruneSegment(_) | PrunerError::InconsistentData(_) => {
                 EngineHookError::Internal(Box::new(err))
             }
-            PrunerError::Interface(err) => err.into(),
             PrunerError::Database(err) => RethError::Database(err).into(),
             PrunerError::Provider(err) => RethError::Provider(err).into(),
         }
diff --git a/crates/prune/src/error.rs b/crates/prune/src/error.rs
index 49333b4db4..348b12f674 100644
--- a/crates/prune/src/error.rs
+++ b/crates/prune/src/error.rs
@@ -4,6 +4,7 @@ use reth_primitives::PruneSegmentError;
 use reth_provider::ProviderError;
 use thiserror::Error;
 
+/// Errors that can occur during pruning.
 #[derive(Error, Debug)]
 pub enum PrunerError {
     #[error(transparent)]
@@ -12,9 +13,6 @@ pub enum PrunerError {
     #[error("inconsistent data: {0}")]
     InconsistentData(&'static str),
 
-    #[error(transparent)]
-    Interface(#[from] RethError),
-
     #[error(transparent)]
     Database(#[from] DatabaseError),
 
@@ -28,7 +26,6 @@ impl From<PrunerError> for RethError {
             PrunerError::PruneSegment(_) | PrunerError::InconsistentData(_) => {
                 RethError::other(err)
             }
-            PrunerError::Interface(err) => err,
             PrunerError::Database(err) => RethError::Database(err),
             PrunerError::Provider(err) => RethError::Provider(err),
         }
diff --git a/crates/prune/src/segments/mod.rs b/crates/prune/src/segments/mod.rs
index 82b95bc07d..d0d66e8176 100644
--- a/crates/prune/src/segments/mod.rs
+++ b/crates/prune/src/segments/mod.rs
@@ -9,27 +9,25 @@ mod storage_history;
 mod transaction_lookup;
 mod transactions;
 
+use crate::PrunerError;
 pub use account_history::AccountHistory;
 pub use headers::Headers;
 pub use receipts::Receipts;
 pub use receipts_by_logs::ReceiptsByLogs;
-pub use sender_recovery::SenderRecovery;
-pub use set::SegmentSet;
-use std::fmt::Debug;
-pub use storage_history::StorageHistory;
-pub use transaction_lookup::TransactionLookup;
-pub use transactions::Transactions;
-
-use crate::PrunerError;
 use reth_db::database::Database;
-use reth_interfaces::{provider::ProviderResult, RethResult};
+use reth_interfaces::provider::ProviderResult;
 use reth_primitives::{
     BlockNumber, PruneCheckpoint, PruneInterruptReason, PruneLimiter, PruneMode, PruneProgress,
     PruneSegment, TxNumber,
 };
 use reth_provider::{BlockReader, DatabaseProviderRW, PruneCheckpointWriter};
-use std::ops::RangeInclusive;
+pub use sender_recovery::SenderRecovery;
+pub use set::SegmentSet;
+use std::{fmt::Debug, ops::RangeInclusive};
+pub use storage_history::StorageHistory;
 use tracing::error;
+pub use transaction_lookup::TransactionLookup;
+pub use transactions::Transactions;
 
 /// A segment represents a pruning of some portion of the data.
 ///
@@ -85,7 +83,7 @@ impl PruneInput {
     pub(crate) fn get_next_tx_num_range<DB: Database>(
         &self,
         provider: &DatabaseProviderRW<DB>,
-    ) -> RethResult<Option<RangeInclusive<TxNumber>>> {
+    ) -> ProviderResult<Option<RangeInclusive<TxNumber>>> {
         let from_tx_number = self.previous_checkpoint
             // Checkpoint exists, prune from the next transaction after the highest pruned one
             .and_then(|checkpoint| match checkpoint.tx_number {