From ef01d502387310462e2c312c39a3548d2f149cf3 Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Fri, 10 May 2024 13:26:44 +0200
Subject: [PATCH] chore: use engine types crate for types (#8170)

---
 Cargo.lock                                       | 2 +-
 crates/storage/provider/Cargo.toml               | 3 ++-
 crates/storage/provider/src/providers/mod.rs     | 2 +-
 crates/storage/provider/src/traits/chain_info.rs | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index caacf7c636..f9c1af70f1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7589,6 +7589,7 @@ name = "reth-provider"
 version = "0.2.0-beta.7"
 dependencies = [
  "alloy-rlp",
+ "alloy-rpc-types-engine",
  "assert_matches",
  "auto_impl",
  "dashmap",
@@ -7605,7 +7606,6 @@ dependencies = [
  "reth-metrics",
  "reth-nippy-jar",
  "reth-primitives",
- "reth-rpc-types",
  "reth-trie",
  "revm",
  "strum",
diff --git a/crates/storage/provider/Cargo.toml b/crates/storage/provider/Cargo.toml
index 672f6a7fc4..1272a824c3 100644
--- a/crates/storage/provider/Cargo.toml
+++ b/crates/storage/provider/Cargo.toml
@@ -15,13 +15,14 @@ workspace = true
 # reth
 reth-primitives.workspace = true
 reth-interfaces.workspace = true
-reth-rpc-types.workspace = true
 reth-db.workspace = true
 reth-trie = { workspace = true, features = ["metrics"] }
 reth-nippy-jar.workspace = true
 reth-codecs.workspace = true
 reth-evm.workspace = true
 
+# ethereum
+alloy-rpc-types-engine.workspace = true
 revm.workspace = true
 
 # async
diff --git a/crates/storage/provider/src/providers/mod.rs b/crates/storage/provider/src/providers/mod.rs
index bf94e32cf4..8a06f0c0d2 100644
--- a/crates/storage/provider/src/providers/mod.rs
+++ b/crates/storage/provider/src/providers/mod.rs
@@ -60,8 +60,8 @@ mod chain_info;
 use chain_info::ChainInfoTracker;
 
 mod consistent_view;
+use alloy_rpc_types_engine::ForkchoiceState;
 pub use consistent_view::{ConsistentDbView, ConsistentViewError};
-use reth_rpc_types::engine::ForkchoiceState;
 
 /// The main type for interacting with the blockchain.
 ///
diff --git a/crates/storage/provider/src/traits/chain_info.rs b/crates/storage/provider/src/traits/chain_info.rs
index 5e6379f01c..76eb7fd3fb 100644
--- a/crates/storage/provider/src/traits/chain_info.rs
+++ b/crates/storage/provider/src/traits/chain_info.rs
@@ -1,5 +1,5 @@
+use alloy_rpc_types_engine::ForkchoiceState;
 use reth_primitives::SealedHeader;
-use reth_rpc_types::engine::ForkchoiceState;
 use std::time::Instant;
 
 /// A type that can track updates related to fork choice updates.