diff --git a/Cargo.lock b/Cargo.lock index d6cb12085..a6e31b062 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7812,10 +7812,10 @@ dependencies = [ "reth-errors", "reth-exex-types", "reth-metrics", - "reth-primitives", "reth-provider", "reth-prune-types", "reth-stages", + "reth-static-file-types", "reth-testing-utils", "reth-tokio-util", "reth-tracing", diff --git a/crates/prune/prune/Cargo.toml b/crates/prune/prune/Cargo.toml index c45ea9d3f..b5d9059c9 100644 --- a/crates/prune/prune/Cargo.toml +++ b/crates/prune/prune/Cargo.toml @@ -15,7 +15,6 @@ workspace = true # reth reth-chainspec.workspace = true reth-exex-types.workspace = true -reth-primitives.workspace = true reth-db.workspace = true reth-db-api.workspace = true reth-errors.workspace = true @@ -23,6 +22,7 @@ reth-provider.workspace = true reth-tokio-util.workspace = true reth-config.workspace = true reth-prune-types.workspace = true +reth-static-file-types.workspace = true # metrics reth-metrics.workspace = true diff --git a/crates/prune/prune/src/pruner.rs b/crates/prune/prune/src/pruner.rs index 47864a274..656aa69ad 100644 --- a/crates/prune/prune/src/pruner.rs +++ b/crates/prune/prune/src/pruner.rs @@ -5,13 +5,14 @@ use crate::{ segments::{PruneInput, Segment}, Metrics, PrunerError, PrunerEvent, }; +use alloy_primitives::BlockNumber; use reth_db_api::database::Database; use reth_exex_types::FinishedExExHeight; -use reth_primitives::{BlockNumber, StaticFileSegment}; use reth_provider::{ DatabaseProviderRW, ProviderFactory, PruneCheckpointReader, StaticFileProviderFactory, }; use reth_prune_types::{PruneLimiter, PruneMode, PruneProgress, PrunePurpose, PruneSegment}; +use reth_static_file_types::StaticFileSegment; use reth_tokio_util::{EventSender, EventStream}; use std::{ collections::BTreeMap, diff --git a/crates/prune/prune/src/segments/account_history.rs b/crates/prune/prune/src/segments/account_history.rs index 78ca36219..ab2800a31 100644 --- a/crates/prune/prune/src/segments/account_history.rs +++ b/crates/prune/prune/src/segments/account_history.rs @@ -106,9 +106,9 @@ mod tests { account_history::ACCOUNT_HISTORY_TABLES_TO_PRUNE, AccountHistory, PruneInput, PruneOutput, Segment, }; + use alloy_primitives::{BlockNumber, B256}; use assert_matches::assert_matches; use reth_db::{tables, BlockNumberList}; - use reth_primitives::{BlockNumber, B256}; use reth_provider::PruneCheckpointReader; use reth_prune_types::{ PruneCheckpoint, PruneInterruptReason, PruneLimiter, PruneMode, PruneProgress, PruneSegment, diff --git a/crates/prune/prune/src/segments/headers.rs b/crates/prune/prune/src/segments/headers.rs index 3cf2beeba..1c49fe8c1 100644 --- a/crates/prune/prune/src/segments/headers.rs +++ b/crates/prune/prune/src/segments/headers.rs @@ -188,10 +188,10 @@ where #[cfg(test)] mod tests { + use alloy_primitives::{BlockNumber, B256, U256}; use assert_matches::assert_matches; use reth_db::tables; use reth_db_api::transaction::DbTx; - use reth_primitives::{BlockNumber, B256, U256}; use reth_provider::PruneCheckpointReader; use reth_prune_types::{ PruneCheckpoint, PruneInterruptReason, PruneLimiter, PruneMode, PruneProgress, PruneSegment, diff --git a/crates/prune/prune/src/segments/history.rs b/crates/prune/prune/src/segments/history.rs index 253d453aa..ee841ef89 100644 --- a/crates/prune/prune/src/segments/history.rs +++ b/crates/prune/prune/src/segments/history.rs @@ -1,3 +1,4 @@ +use alloy_primitives::BlockNumber; use reth_db::BlockNumberList; use reth_db_api::{ cursor::{DbCursorRO, DbCursorRW}, @@ -7,7 +8,6 @@ use reth_db_api::{ transaction::DbTxMut, DatabaseError, }; -use reth_primitives::BlockNumber; use reth_provider::DatabaseProviderRW; /// Prune history indices up to the provided block, inclusive. diff --git a/crates/prune/prune/src/segments/receipts.rs b/crates/prune/prune/src/segments/receipts.rs index ef6e502c7..5b8118778 100644 --- a/crates/prune/prune/src/segments/receipts.rs +++ b/crates/prune/prune/src/segments/receipts.rs @@ -94,13 +94,13 @@ impl Segment for Receipts { #[cfg(test)] mod tests { use crate::segments::{PruneInput, PruneOutput, Receipts, Segment}; + use alloy_primitives::{BlockNumber, TxNumber, B256}; use assert_matches::assert_matches; use itertools::{ FoldWhile::{Continue, Done}, Itertools, }; use reth_db::tables; - use reth_primitives::{BlockNumber, TxNumber, B256}; use reth_provider::PruneCheckpointReader; use reth_prune_types::{ PruneCheckpoint, PruneInterruptReason, PruneLimiter, PruneMode, PruneProgress, PruneSegment, diff --git a/crates/prune/prune/src/segments/receipts_by_logs.rs b/crates/prune/prune/src/segments/receipts_by_logs.rs index f4ccad810..63b5941c3 100644 --- a/crates/prune/prune/src/segments/receipts_by_logs.rs +++ b/crates/prune/prune/src/segments/receipts_by_logs.rs @@ -216,10 +216,10 @@ impl Segment for ReceiptsByLogs { #[cfg(test)] mod tests { use crate::segments::{receipts_by_logs::ReceiptsByLogs, PruneInput, Segment}; + use alloy_primitives::B256; use assert_matches::assert_matches; use reth_db::tables; use reth_db_api::{cursor::DbCursorRO, transaction::DbTx}; - use reth_primitives::B256; use reth_provider::{PruneCheckpointReader, TransactionsProvider}; use reth_prune_types::{PruneLimiter, PruneMode, PruneSegment, ReceiptsLogPruneConfig}; use reth_stages::test_utils::{StorageKind, TestStageDB}; diff --git a/crates/prune/prune/src/segments/sender_recovery.rs b/crates/prune/prune/src/segments/sender_recovery.rs index f13dfde25..94ef6ffb7 100644 --- a/crates/prune/prune/src/segments/sender_recovery.rs +++ b/crates/prune/prune/src/segments/sender_recovery.rs @@ -77,13 +77,13 @@ impl Segment for SenderRecovery { #[cfg(test)] mod tests { use crate::segments::{PruneInput, PruneOutput, Segment, SenderRecovery}; + use alloy_primitives::{BlockNumber, TxNumber, B256}; use assert_matches::assert_matches; use itertools::{ FoldWhile::{Continue, Done}, Itertools, }; use reth_db::tables; - use reth_primitives::{BlockNumber, TxNumber, B256}; use reth_provider::PruneCheckpointReader; use reth_prune_types::{PruneCheckpoint, PruneLimiter, PruneMode, PruneProgress, PruneSegment}; use reth_stages::test_utils::{StorageKind, TestStageDB}; diff --git a/crates/prune/prune/src/segments/storage_history.rs b/crates/prune/prune/src/segments/storage_history.rs index 18af8134c..3e7ad86a7 100644 --- a/crates/prune/prune/src/segments/storage_history.rs +++ b/crates/prune/prune/src/segments/storage_history.rs @@ -109,9 +109,9 @@ mod tests { storage_history::STORAGE_HISTORY_TABLES_TO_PRUNE, PruneInput, PruneOutput, Segment, StorageHistory, }; + use alloy_primitives::{BlockNumber, B256}; use assert_matches::assert_matches; use reth_db::{tables, BlockNumberList}; - use reth_primitives::{BlockNumber, B256}; use reth_provider::PruneCheckpointReader; use reth_prune_types::{PruneCheckpoint, PruneLimiter, PruneMode, PruneProgress, PruneSegment}; use reth_stages::test_utils::{StorageKind, TestStageDB}; diff --git a/crates/prune/prune/src/segments/transaction_lookup.rs b/crates/prune/prune/src/segments/transaction_lookup.rs index b77b01933..457f551c1 100644 --- a/crates/prune/prune/src/segments/transaction_lookup.rs +++ b/crates/prune/prune/src/segments/transaction_lookup.rs @@ -104,13 +104,13 @@ impl Segment for TransactionLookup { #[cfg(test)] mod tests { use crate::segments::{PruneInput, PruneOutput, Segment, TransactionLookup}; + use alloy_primitives::{BlockNumber, TxNumber, B256}; use assert_matches::assert_matches; use itertools::{ FoldWhile::{Continue, Done}, Itertools, }; use reth_db::tables; - use reth_primitives::{BlockNumber, TxNumber, B256}; use reth_provider::PruneCheckpointReader; use reth_prune_types::{ PruneCheckpoint, PruneInterruptReason, PruneLimiter, PruneMode, PruneProgress, PruneSegment, diff --git a/crates/prune/prune/src/segments/transactions.rs b/crates/prune/prune/src/segments/transactions.rs index 5a7305a1b..fd24a380d 100644 --- a/crates/prune/prune/src/segments/transactions.rs +++ b/crates/prune/prune/src/segments/transactions.rs @@ -76,13 +76,13 @@ impl Segment for Transactions { #[cfg(test)] mod tests { use crate::segments::{PruneInput, PruneOutput, Segment, Transactions}; + use alloy_primitives::{BlockNumber, TxNumber, B256}; use assert_matches::assert_matches; use itertools::{ FoldWhile::{Continue, Done}, Itertools, }; use reth_db::tables; - use reth_primitives::{BlockNumber, TxNumber, B256}; use reth_provider::PruneCheckpointReader; use reth_prune_types::{ PruneCheckpoint, PruneInterruptReason, PruneLimiter, PruneMode, PruneProgress, PruneSegment,