From e89d171fc842edeecc2592a8de56c0a09c8ea74b Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Fri, 13 Dec 2024 16:13:33 +0100
Subject: [PATCH] chore: use reth-primitives-traits-directly (#13386)

---
 crates/storage/storage-api/src/account.rs    | 2 +-
 crates/storage/storage-api/src/chain_info.rs | 2 +-
 crates/storage/storage-api/src/header.rs     | 3 +--
 crates/storage/storage-api/src/history.rs    | 2 +-
 crates/storage/storage-api/src/primitives.rs | 2 +-
 crates/storage/storage-api/src/state.rs      | 2 +-
 crates/storage/storage-api/src/storage.rs    | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/crates/storage/storage-api/src/account.rs b/crates/storage/storage-api/src/account.rs
index e082980311..1c8c9e4246 100644
--- a/crates/storage/storage-api/src/account.rs
+++ b/crates/storage/storage-api/src/account.rs
@@ -1,7 +1,7 @@
 use alloy_primitives::{Address, BlockNumber};
 use auto_impl::auto_impl;
 use reth_db_models::AccountBeforeTx;
-use reth_primitives::Account;
+use reth_primitives_traits::Account;
 use reth_storage_errors::provider::ProviderResult;
 use std::{
     collections::{BTreeMap, BTreeSet},
diff --git a/crates/storage/storage-api/src/chain_info.rs b/crates/storage/storage-api/src/chain_info.rs
index b6f58b7e73..a15bf58a01 100644
--- a/crates/storage/storage-api/src/chain_info.rs
+++ b/crates/storage/storage-api/src/chain_info.rs
@@ -1,5 +1,5 @@
 use alloy_rpc_types_engine::ForkchoiceState;
-use reth_primitives::SealedHeader;
+use reth_primitives_traits::SealedHeader;
 use std::time::Instant;
 
 /// A type that can track updates related to fork choice updates.
diff --git a/crates/storage/storage-api/src/header.rs b/crates/storage/storage-api/src/header.rs
index b2d2c1663e..b331a9e3a9 100644
--- a/crates/storage/storage-api/src/header.rs
+++ b/crates/storage/storage-api/src/header.rs
@@ -1,7 +1,6 @@
 use alloy_eips::BlockHashOrNumber;
 use alloy_primitives::{BlockHash, BlockNumber, U256};
-use reth_primitives::SealedHeader;
-use reth_primitives_traits::BlockHeader;
+use reth_primitives_traits::{BlockHeader, SealedHeader};
 use reth_storage_errors::provider::ProviderResult;
 use std::ops::RangeBounds;
 
diff --git a/crates/storage/storage-api/src/history.rs b/crates/storage/storage-api/src/history.rs
index 4eadd6031c..77c6324d88 100644
--- a/crates/storage/storage-api/src/history.rs
+++ b/crates/storage/storage-api/src/history.rs
@@ -1,7 +1,7 @@
 use alloy_primitives::{Address, BlockNumber, B256};
 use auto_impl::auto_impl;
 use reth_db::models::{AccountBeforeTx, BlockNumberAddress};
-use reth_primitives::StorageEntry;
+use reth_primitives_traits::StorageEntry;
 use reth_storage_errors::provider::ProviderResult;
 use std::ops::{RangeBounds, RangeInclusive};
 
diff --git a/crates/storage/storage-api/src/primitives.rs b/crates/storage/storage-api/src/primitives.rs
index ae2a72e6e5..3e113028bd 100644
--- a/crates/storage/storage-api/src/primitives.rs
+++ b/crates/storage/storage-api/src/primitives.rs
@@ -1,4 +1,4 @@
-use reth_primitives::NodePrimitives;
+use reth_primitives_traits::NodePrimitives;
 
 /// Provider implementation that knows configured [`NodePrimitives`].
 #[auto_impl::auto_impl(&, Arc, Box)]
diff --git a/crates/storage/storage-api/src/state.rs b/crates/storage/storage-api/src/state.rs
index dc53319f4c..015bd7fcc8 100644
--- a/crates/storage/storage-api/src/state.rs
+++ b/crates/storage/storage-api/src/state.rs
@@ -6,7 +6,7 @@ use alloy_consensus::constants::KECCAK_EMPTY;
 use alloy_eips::{BlockId, BlockNumberOrTag};
 use alloy_primitives::{Address, BlockHash, BlockNumber, StorageKey, StorageValue, B256, U256};
 use auto_impl::auto_impl;
-use reth_primitives::Bytecode;
+use reth_primitives_traits::Bytecode;
 use reth_storage_errors::provider::ProviderResult;
 use reth_trie::HashedPostState;
 use reth_trie_db::StateCommitment;
diff --git a/crates/storage/storage-api/src/storage.rs b/crates/storage/storage-api/src/storage.rs
index 0544f9a74c..fbdde13745 100644
--- a/crates/storage/storage-api/src/storage.rs
+++ b/crates/storage/storage-api/src/storage.rs
@@ -1,6 +1,6 @@
 use alloy_primitives::{Address, BlockNumber, B256};
 use reth_db_api::models::BlockNumberAddress;
-use reth_primitives::StorageEntry;
+use reth_primitives_traits::StorageEntry;
 use reth_storage_errors::provider::ProviderResult;
 use std::{
     collections::{BTreeMap, BTreeSet},