From 5b6cc1d36ec83796950c5a1489dc5a6cc5bd63a8 Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Wed, 26 Jun 2024 00:56:31 +0200
Subject: [PATCH] chore: import from static files crate directly

---
 bin/reth/src/commands/db/clear.rs           | 2 +-
 bin/reth/src/commands/db/get.rs             | 3 ++-
 bin/reth/src/commands/db/stats.rs           | 2 +-
 bin/reth/src/commands/import_receipts_op.rs | 3 ++-
 bin/reth/src/commands/stage/drop.rs         | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/bin/reth/src/commands/db/clear.rs b/bin/reth/src/commands/db/clear.rs
index 76c1b97e38ad..b9edf458d3f4 100644
--- a/bin/reth/src/commands/db/clear.rs
+++ b/bin/reth/src/commands/db/clear.rs
@@ -5,8 +5,8 @@ use reth_db_api::{
     table::Table,
     transaction::{DbTx, DbTxMut},
 };
-use reth_primitives::{static_file::find_fixed_range, StaticFileSegment};
 use reth_provider::{ProviderFactory, StaticFileProviderFactory};
+use reth_static_file_types::{find_fixed_range, StaticFileSegment};
 
 /// The arguments for the `reth db clear` command
 #[derive(Parser, Debug)]
diff --git a/bin/reth/src/commands/db/get.rs b/bin/reth/src/commands/db/get.rs
index 699a31471802..a4987e4b4281 100644
--- a/bin/reth/src/commands/db/get.rs
+++ b/bin/reth/src/commands/db/get.rs
@@ -8,8 +8,9 @@ use reth_db_api::{
     database::Database,
     table::{Decompress, DupSort, Table},
 };
-use reth_primitives::{BlockHash, Header, StaticFileSegment};
+use reth_primitives::{BlockHash, Header};
 use reth_provider::StaticFileProviderFactory;
+use reth_static_file_types::StaticFileSegment;
 use tracing::error;
 
 /// The arguments for the `reth db get` command
diff --git a/bin/reth/src/commands/db/stats.rs b/bin/reth/src/commands/db/stats.rs
index 517b9c9e591f..9e1eebd95220 100644
--- a/bin/reth/src/commands/db/stats.rs
+++ b/bin/reth/src/commands/db/stats.rs
@@ -8,8 +8,8 @@ use reth_db::{mdbx, static_file::iter_static_files, DatabaseEnv, TableViewer, Ta
 use reth_db_api::database::Database;
 use reth_fs_util as fs;
 use reth_node_core::dirs::{ChainPath, DataDirPath};
-use reth_primitives::static_file::{find_fixed_range, SegmentRangeInclusive};
 use reth_provider::providers::StaticFileProvider;
+use reth_static_file_types::{find_fixed_range, SegmentRangeInclusive};
 use std::{sync::Arc, time::Duration};
 
 #[derive(Parser, Debug)]
diff --git a/bin/reth/src/commands/import_receipts_op.rs b/bin/reth/src/commands/import_receipts_op.rs
index d77332f86be2..7623c626cb02 100644
--- a/bin/reth/src/commands/import_receipts_op.rs
+++ b/bin/reth/src/commands/import_receipts_op.rs
@@ -13,12 +13,13 @@ use reth_downloaders::{
 use reth_execution_types::ExecutionOutcome;
 use reth_node_core::version::SHORT_VERSION;
 use reth_optimism_primitives::bedrock_import::is_dup_tx;
-use reth_primitives::{Receipts, StaticFileSegment};
+use reth_primitives::Receipts;
 use reth_provider::{
     OriginalValuesKnown, ProviderFactory, StageCheckpointReader, StateWriter,
     StaticFileProviderFactory, StaticFileWriter, StatsReader,
 };
 use reth_stages::StageId;
+use reth_static_file_types::StaticFileSegment;
 use std::path::{Path, PathBuf};
 use tracing::{debug, error, info, trace};
 
diff --git a/bin/reth/src/commands/stage/drop.rs b/bin/reth/src/commands/stage/drop.rs
index 8297eafef81a..320c88682a8d 100644
--- a/bin/reth/src/commands/stage/drop.rs
+++ b/bin/reth/src/commands/stage/drop.rs
@@ -10,9 +10,9 @@ use itertools::Itertools;
 use reth_db::{static_file::iter_static_files, tables, DatabaseEnv};
 use reth_db_api::transaction::DbTxMut;
 use reth_db_common::init::{insert_genesis_header, insert_genesis_history, insert_genesis_state};
-use reth_primitives::{static_file::find_fixed_range, StaticFileSegment};
 use reth_provider::{providers::StaticFileWriter, StaticFileProviderFactory};
 use reth_stages::StageId;
+use reth_static_file_types::{find_fixed_range, StaticFileSegment};
 
 /// `reth drop-stage` command
 #[derive(Debug, Parser)]