diff --git a/Cargo.lock b/Cargo.lock index 3bf7e7f4c233..77c38ee44961 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8177,16 +8177,17 @@ dependencies = [ name = "reth-static-file" version = "1.0.0-rc.1" dependencies = [ + "alloy-primitives", "assert_matches", "parking_lot 0.12.3", "rayon", "reth-db", "reth-db-api", "reth-nippy-jar", - "reth-primitives", "reth-provider", "reth-prune-types", "reth-stages", + "reth-static-file-types", "reth-storage-errors", "reth-testing-utils", "reth-tokio-util", diff --git a/crates/static-file/static-file/Cargo.toml b/crates/static-file/static-file/Cargo.toml index 4d4e31509aeb..29a601f050d0 100644 --- a/crates/static-file/static-file/Cargo.toml +++ b/crates/static-file/static-file/Cargo.toml @@ -13,7 +13,6 @@ workspace = true [dependencies] # reth -reth-primitives.workspace = true reth-db.workspace = true reth-db-api.workspace = true reth-provider.workspace = true @@ -21,6 +20,9 @@ reth-storage-errors.workspace = true reth-nippy-jar.workspace = true reth-tokio-util.workspace = true reth-prune-types.workspace = true +reth-static-file-types.workspace = true + +alloy-primitives.workspace = true # misc tracing.workspace = true diff --git a/crates/static-file/static-file/src/lib.rs b/crates/static-file/static-file/src/lib.rs index f545298ebd47..1bfe4134e954 100644 --- a/crates/static-file/static-file/src/lib.rs +++ b/crates/static-file/static-file/src/lib.rs @@ -16,3 +16,6 @@ pub use static_file_producer::{ StaticFileProducer, StaticFileProducerInner, StaticFileProducerResult, StaticFileProducerWithResult, StaticFileTargets, }; + +// Re-export for convenience. +pub use reth_static_file_types::*; diff --git a/crates/static-file/static-file/src/segments/headers.rs b/crates/static-file/static-file/src/segments/headers.rs index 5fb1a4422e82..e87c1fdc58e8 100644 --- a/crates/static-file/static-file/src/segments/headers.rs +++ b/crates/static-file/static-file/src/segments/headers.rs @@ -1,11 +1,12 @@ use crate::segments::{dataset_for_compression, prepare_jar, Segment, SegmentHeader}; +use alloy_primitives::BlockNumber; use reth_db::{static_file::create_static_file_T1_T2_T3, tables, RawKey, RawTable}; use reth_db_api::{cursor::DbCursorRO, database::Database, transaction::DbTx}; -use reth_primitives::{static_file::SegmentConfig, BlockNumber, StaticFileSegment}; use reth_provider::{ providers::{StaticFileProvider, StaticFileWriter}, DatabaseProviderRO, }; +use reth_static_file_types::{SegmentConfig, StaticFileSegment}; use reth_storage_errors::provider::ProviderResult; use std::{ops::RangeInclusive, path::Path}; diff --git a/crates/static-file/static-file/src/segments/mod.rs b/crates/static-file/static-file/src/segments/mod.rs index e21f8ad7a12b..77798dd08542 100644 --- a/crates/static-file/static-file/src/segments/mod.rs +++ b/crates/static-file/static-file/src/segments/mod.rs @@ -9,19 +9,17 @@ pub use headers::Headers; mod receipts; pub use receipts::Receipts; +use alloy_primitives::BlockNumber; use reth_db::{RawKey, RawTable}; use reth_db_api::{cursor::DbCursorRO, database::Database, table::Table, transaction::DbTx}; use reth_nippy_jar::NippyJar; -use reth_primitives::{ - static_file::{ - find_fixed_range, Compression, Filters, InclusionFilter, PerfectHashingFunction, - SegmentConfig, SegmentHeader, - }, - BlockNumber, StaticFileSegment, -}; use reth_provider::{ providers::StaticFileProvider, DatabaseProviderRO, ProviderError, TransactionsProviderExt, }; +use reth_static_file_types::{ + find_fixed_range, Compression, Filters, InclusionFilter, PerfectHashingFunction, SegmentConfig, + SegmentHeader, StaticFileSegment, +}; use reth_storage_errors::provider::ProviderResult; use std::{ops::RangeInclusive, path::Path}; diff --git a/crates/static-file/static-file/src/segments/receipts.rs b/crates/static-file/static-file/src/segments/receipts.rs index e0ed58086722..e09b5e690df9 100644 --- a/crates/static-file/static-file/src/segments/receipts.rs +++ b/crates/static-file/static-file/src/segments/receipts.rs @@ -1,14 +1,12 @@ use crate::segments::{dataset_for_compression, prepare_jar, Segment}; +use alloy_primitives::{BlockNumber, TxNumber}; use reth_db::{static_file::create_static_file_T1, tables}; use reth_db_api::{cursor::DbCursorRO, database::Database, transaction::DbTx}; -use reth_primitives::{ - static_file::{SegmentConfig, SegmentHeader}, - BlockNumber, StaticFileSegment, TxNumber, -}; use reth_provider::{ providers::{StaticFileProvider, StaticFileWriter}, BlockReader, DatabaseProviderRO, TransactionsProviderExt, }; +use reth_static_file_types::{SegmentConfig, SegmentHeader, StaticFileSegment}; use reth_storage_errors::provider::{ProviderError, ProviderResult}; use std::{ops::RangeInclusive, path::Path}; diff --git a/crates/static-file/static-file/src/segments/transactions.rs b/crates/static-file/static-file/src/segments/transactions.rs index 47eaa727250c..c7daeba0675f 100644 --- a/crates/static-file/static-file/src/segments/transactions.rs +++ b/crates/static-file/static-file/src/segments/transactions.rs @@ -1,14 +1,12 @@ use crate::segments::{dataset_for_compression, prepare_jar, Segment}; +use alloy_primitives::{BlockNumber, TxNumber}; use reth_db::{static_file::create_static_file_T1, tables}; use reth_db_api::{cursor::DbCursorRO, database::Database, transaction::DbTx}; -use reth_primitives::{ - static_file::{SegmentConfig, SegmentHeader}, - BlockNumber, StaticFileSegment, TxNumber, -}; use reth_provider::{ providers::{StaticFileProvider, StaticFileWriter}, BlockReader, DatabaseProviderRO, TransactionsProviderExt, }; +use reth_static_file_types::{SegmentConfig, SegmentHeader, StaticFileSegment}; use reth_storage_errors::provider::{ProviderError, ProviderResult}; use std::{ops::RangeInclusive, path::Path}; diff --git a/crates/static-file/static-file/src/static_file_producer.rs b/crates/static-file/static-file/src/static_file_producer.rs index 396fdd5ed08d..44ea3a5c84b4 100644 --- a/crates/static-file/static-file/src/static_file_producer.rs +++ b/crates/static-file/static-file/src/static_file_producer.rs @@ -1,12 +1,13 @@ //! Support for producing static files. use crate::{segments, segments::Segment, StaticFileProducerEvent}; +use alloy_primitives::BlockNumber; use parking_lot::Mutex; use rayon::prelude::*; use reth_db_api::database::Database; -use reth_primitives::{static_file::HighestStaticFiles, BlockNumber}; use reth_provider::{providers::StaticFileWriter, ProviderFactory, StaticFileProviderFactory}; use reth_prune_types::PruneModes; +use reth_static_file_types::HighestStaticFiles; use reth_storage_errors::provider::ProviderResult; use reth_tokio_util::{EventSender, EventStream}; use std::{ @@ -228,15 +229,16 @@ mod tests { use crate::static_file_producer::{ StaticFileProducer, StaticFileProducerInner, StaticFileTargets, }; + use alloy_primitives::{B256, U256}; use assert_matches::assert_matches; use reth_db::{test_utils::TempDatabase, DatabaseEnv}; use reth_db_api::{database::Database, transaction::DbTx}; - use reth_primitives::{static_file::HighestStaticFiles, StaticFileSegment, B256, U256}; use reth_provider::{ providers::StaticFileWriter, ProviderError, ProviderFactory, StaticFileProviderFactory, }; use reth_prune_types::PruneModes; use reth_stages::test_utils::{StorageKind, TestStageDB}; + use reth_static_file_types::{HighestStaticFiles, StaticFileSegment}; use reth_testing_utils::{ generators, generators::{random_block_range, random_receipt},