remove reth_primitives

crates/static-file/static-file/Cargo.toml

@@ -13,14 +13,16 @@ workspace = true
 
 [dependencies]
 # reth
-reth-primitives.workspace = true
 reth-db.workspace = true
 reth-db-api.workspace = true
 reth-provider.workspace = true
 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

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::*;

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};
 

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};
 

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};
 

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};
 

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},