chore: rm reth-interfaces from prune (#8469)

Cargo.lock

@@ -7711,11 +7711,12 @@ dependencies = [
  "rayon",
  "reth-config",
  "reth-db",
- "reth-interfaces",
+ "reth-errors",
  "reth-metrics",
  "reth-primitives",
  "reth-provider",
  "reth-stages",
+ "reth-testing-utils",
  "reth-tokio-util",
  "reth-tracing",
  "thiserror",

crates/prune/Cargo.toml

@@ -15,8 +15,8 @@ workspace = true
 # reth
 reth-primitives.workspace = true
 reth-db.workspace = true
+reth-errors.workspace = true
 reth-provider.workspace = true
-reth-interfaces.workspace = true
 reth-tokio-util.workspace = true
 reth-config.workspace = true
 
@@ -35,6 +35,7 @@ tokio.workspace = true
 # reth
 reth-db = { workspace = true, features = ["test-utils"] }
 reth-stages = { workspace = true, features = ["test-utils"] }
+reth-testing-utils.workspace = true
 reth-tracing.workspace = true
 
 assert_matches.workspace = true

crates/prune/src/error.rs

@@ -1,5 +1,5 @@
 use reth_db::DatabaseError;
-use reth_interfaces::RethError;
+use reth_errors::RethError;
 use reth_primitives::PruneSegmentError;
 use reth_provider::ProviderError;
 use thiserror::Error;

crates/prune/src/segments/account_history.rs

@@ -107,16 +107,16 @@ mod tests {
     };
     use assert_matches::assert_matches;
     use reth_db::{tables, BlockNumberList};
-    use reth_interfaces::test_utils::{
-        generators,
-        generators::{random_block_range, random_changeset_range, random_eoa_accounts},
-    };
     use reth_primitives::{
         BlockNumber, PruneCheckpoint, PruneInterruptReason, PruneLimiter, PruneMode, PruneProgress,
         PruneSegment, B256,
     };
     use reth_provider::PruneCheckpointReader;
     use reth_stages::test_utils::{StorageKind, TestStageDB};
+    use reth_testing_utils::{
+        generators,
+        generators::{random_block_range, random_changeset_range, random_eoa_accounts},
+    };
     use std::{collections::BTreeMap, ops::AddAssign};
 
     #[test]

crates/prune/src/segments/headers.rs

@@ -189,13 +189,13 @@ where
 mod tests {
     use assert_matches::assert_matches;
     use reth_db::{tables, transaction::DbTx};
-    use reth_interfaces::test_utils::{generators, generators::random_header_range};
     use reth_primitives::{
         BlockNumber, PruneCheckpoint, PruneInterruptReason, PruneLimiter, PruneMode, PruneProgress,
         PruneSegment, B256, U256,
     };
     use reth_provider::PruneCheckpointReader;
     use reth_stages::test_utils::TestStageDB;
+    use reth_testing_utils::{generators, generators::random_header_range};
     use tracing::trace;
 
     use crate::segments::{

crates/prune/src/segments/history.rs

@@ -4,9 +4,8 @@ use reth_db::{
     models::ShardedKey,
     table::Table,
     transaction::DbTxMut,
-    BlockNumberList,
+    BlockNumberList, DatabaseError,
 };
-use reth_interfaces::db::DatabaseError;
 use reth_primitives::BlockNumber;
 use reth_provider::DatabaseProviderRW;
 

crates/prune/src/segments/mod.rs

@@ -15,12 +15,13 @@ pub use headers::Headers;
 pub use receipts::Receipts;
 pub use receipts_by_logs::ReceiptsByLogs;
 use reth_db::database::Database;
-use reth_interfaces::provider::ProviderResult;
 use reth_primitives::{
     BlockNumber, PruneCheckpoint, PruneInterruptReason, PruneLimiter, PruneMode, PruneProgress,
     PruneSegment, TxNumber,
 };
-use reth_provider::{BlockReader, DatabaseProviderRW, PruneCheckpointWriter};
+use reth_provider::{
+    errors::provider::ProviderResult, BlockReader, DatabaseProviderRW, PruneCheckpointWriter,
+};
 pub use sender_recovery::SenderRecovery;
 pub use set::SegmentSet;
 use std::{fmt::Debug, ops::RangeInclusive};
@@ -101,7 +102,7 @@ impl PruneInput {
                 let last_tx = body.last_tx_num();
                 if last_tx + body.tx_count() == 0 {
                     // Prevents a scenario where the pruner correctly starts at a finalized block,
-                    // but the first transaction (tx_num = 0) only appears on an unfinalized one.
+                    // but the first transaction (tx_num = 0) only appears on an non-finalized one.
                     // Should only happen on a test/hive scenario.
                     return Ok(None)
                 }

crates/prune/src/segments/receipts.rs

@@ -3,9 +3,11 @@ use crate::{
     PrunerError,
 };
 use reth_db::{database::Database, tables};
-use reth_interfaces::provider::ProviderResult;
 use reth_primitives::{PruneCheckpoint, PruneMode, PruneProgress, PruneSegment};
-use reth_provider::{DatabaseProviderRW, PruneCheckpointWriter, TransactionsProvider};
+use reth_provider::{
+    errors::provider::ProviderResult, DatabaseProviderRW, PruneCheckpointWriter,
+    TransactionsProvider,
+};
 use tracing::{instrument, trace};
 
 #[derive(Debug)]
@@ -97,16 +99,16 @@ mod tests {
         Itertools,
     };
     use reth_db::tables;
-    use reth_interfaces::test_utils::{
-        generators,
-        generators::{random_block_range, random_receipt},
-    };
     use reth_primitives::{
         BlockNumber, PruneCheckpoint, PruneInterruptReason, PruneLimiter, PruneMode, PruneProgress,
         PruneSegment, TxNumber, B256,
     };
     use reth_provider::PruneCheckpointReader;
     use reth_stages::test_utils::{StorageKind, TestStageDB};
+    use reth_testing_utils::{
+        generators,
+        generators::{random_block_range, random_receipt},
+    };
     use std::ops::Sub;
 
     #[test]

crates/prune/src/segments/receipts_by_logs.rs

@@ -217,13 +217,13 @@ mod tests {
     use crate::segments::{receipts_by_logs::ReceiptsByLogs, PruneInput, Segment};
     use assert_matches::assert_matches;
     use reth_db::{cursor::DbCursorRO, tables, transaction::DbTx};
-    use reth_interfaces::test_utils::{
-        generators,
-        generators::{random_block_range, random_eoa_account, random_log, random_receipt},
-    };
     use reth_primitives::{PruneLimiter, PruneMode, PruneSegment, ReceiptsLogPruneConfig, B256};
     use reth_provider::{PruneCheckpointReader, TransactionsProvider};
     use reth_stages::test_utils::{StorageKind, TestStageDB};
+    use reth_testing_utils::{
+        generators,
+        generators::{random_block_range, random_eoa_account, random_log, random_receipt},
+    };
     use std::collections::BTreeMap;
 
     #[test]

crates/prune/src/segments/sender_recovery.rs

@@ -82,13 +82,13 @@ mod tests {
         Itertools,
     };
     use reth_db::tables;
-    use reth_interfaces::test_utils::{generators, generators::random_block_range};
     use reth_primitives::{
         BlockNumber, PruneCheckpoint, PruneLimiter, PruneMode, PruneProgress, PruneSegment,
         TxNumber, B256,
     };
     use reth_provider::PruneCheckpointReader;
     use reth_stages::test_utils::{StorageKind, TestStageDB};
+    use reth_testing_utils::{generators, generators::random_block_range};
     use std::ops::Sub;
 
     #[test]

crates/prune/src/segments/storage_history.rs

@@ -111,15 +111,15 @@ mod tests {
     };
     use assert_matches::assert_matches;
     use reth_db::{tables, BlockNumberList};
-    use reth_interfaces::test_utils::{
-        generators,
-        generators::{random_block_range, random_changeset_range, random_eoa_accounts},
-    };
     use reth_primitives::{
         BlockNumber, PruneCheckpoint, PruneLimiter, PruneMode, PruneProgress, PruneSegment, B256,
     };
     use reth_provider::PruneCheckpointReader;
     use reth_stages::test_utils::{StorageKind, TestStageDB};
+    use reth_testing_utils::{
+        generators,
+        generators::{random_block_range, random_changeset_range, random_eoa_accounts},
+    };
     use std::{collections::BTreeMap, ops::AddAssign};
 
     #[test]

crates/prune/src/segments/transaction_lookup.rs

@@ -109,13 +109,13 @@ mod tests {
         Itertools,
     };
     use reth_db::tables;
-    use reth_interfaces::test_utils::{generators, generators::random_block_range};
     use reth_primitives::{
         BlockNumber, PruneCheckpoint, PruneInterruptReason, PruneLimiter, PruneMode, PruneProgress,
         PruneSegment, TxNumber, B256,
     };
     use reth_provider::PruneCheckpointReader;
     use reth_stages::test_utils::{StorageKind, TestStageDB};
+    use reth_testing_utils::{generators, generators::random_block_range};
     use std::ops::Sub;
 
     #[test]

crates/prune/src/segments/transactions.rs

@@ -81,13 +81,13 @@ mod tests {
         Itertools,
     };
     use reth_db::tables;
-    use reth_interfaces::test_utils::{generators, generators::random_block_range};
     use reth_primitives::{
         BlockNumber, PruneCheckpoint, PruneInterruptReason, PruneLimiter, PruneMode, PruneProgress,
         PruneSegment, TxNumber, B256,
     };
     use reth_provider::PruneCheckpointReader;
     use reth_stages::test_utils::{StorageKind, TestStageDB};
+    use reth_testing_utils::{generators, generators::random_block_range};
     use std::ops::Sub;
 
     #[test]