From 405fc4361a47a193e5f5b0aec79e07ea3bdf141d Mon Sep 17 00:00:00 2001
From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com>
Date: Sun, 22 Sep 2024 14:44:03 +0200
Subject: [PATCH] rpc: rm useless `alloy-rpc-types-anvil` reexport (#11094)

Co-authored-by: Emilia Hane <elsaemiliaevahane@gmail.com>
---
 Cargo.lock                        | 2 +-
 crates/rpc/rpc-api/Cargo.toml     | 1 +
 crates/rpc/rpc-api/src/anvil.rs   | 6 ++----
 crates/rpc/rpc-api/src/ganache.rs | 2 +-
 crates/rpc/rpc-api/src/hardhat.rs | 2 +-
 crates/rpc/rpc-types/Cargo.toml   | 1 -
 crates/rpc/rpc-types/src/lib.rs   | 3 ---
 7 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index abda07ca0..b3eca8f54 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8439,6 +8439,7 @@ dependencies = [
  "alloy-eips",
  "alloy-json-rpc",
  "alloy-primitives",
+ "alloy-rpc-types-anvil",
  "alloy-rpc-types-eth",
  "alloy-rpc-types-mev",
  "alloy-rpc-types-txpool",
@@ -8672,7 +8673,6 @@ dependencies = [
  "alloy-primitives",
  "alloy-rpc-types",
  "alloy-rpc-types-admin",
- "alloy-rpc-types-anvil",
  "alloy-rpc-types-beacon",
  "alloy-rpc-types-debug",
  "alloy-rpc-types-engine",
diff --git a/crates/rpc/rpc-api/Cargo.toml b/crates/rpc/rpc-api/Cargo.toml
index b6967a36e..6d726ef9a 100644
--- a/crates/rpc/rpc-api/Cargo.toml
+++ b/crates/rpc/rpc-api/Cargo.toml
@@ -24,6 +24,7 @@ alloy-eips.workspace = true
 alloy-json-rpc.workspace = true
 alloy-primitives.workspace = true
 alloy-rpc-types-eth.workspace = true
+alloy-rpc-types-anvil.workspace = true
 alloy-rpc-types-mev.workspace = true
 alloy-rpc-types-txpool.workspace = true
 
diff --git a/crates/rpc/rpc-api/src/anvil.rs b/crates/rpc/rpc-api/src/anvil.rs
index e916fa8c2..99ed3721d 100644
--- a/crates/rpc/rpc-api/src/anvil.rs
+++ b/crates/rpc/rpc-api/src/anvil.rs
@@ -1,10 +1,8 @@
 use jsonrpsee::{core::RpcResult, proc_macros::rpc};
 
 use alloy_primitives::{Address, Bytes, B256, U256};
-use reth_rpc_types::{
-    anvil::{Forking, Metadata, MineOptions, NodeInfo},
-    Block,
-};
+use alloy_rpc_types_anvil::{Forking, Metadata, MineOptions, NodeInfo};
+use reth_rpc_types::Block;
 
 /// Anvil rpc interface.
 /// https://book.getfoundry.sh/reference/anvil/#custom-methods
diff --git a/crates/rpc/rpc-api/src/ganache.rs b/crates/rpc/rpc-api/src/ganache.rs
index 99a50c0fa..0f46b481e 100644
--- a/crates/rpc/rpc-api/src/ganache.rs
+++ b/crates/rpc/rpc-api/src/ganache.rs
@@ -1,6 +1,6 @@
 use alloy_primitives::U256;
+use alloy_rpc_types_anvil::MineOptions;
 use jsonrpsee::{core::RpcResult, proc_macros::rpc};
-use reth_rpc_types::anvil::MineOptions;
 
 /// Ganache rpc interface.
 /// https://github.com/trufflesuite/ganache/tree/develop/docs
diff --git a/crates/rpc/rpc-api/src/hardhat.rs b/crates/rpc/rpc-api/src/hardhat.rs
index c34991fd3..e6c42c99b 100644
--- a/crates/rpc/rpc-api/src/hardhat.rs
+++ b/crates/rpc/rpc-api/src/hardhat.rs
@@ -1,6 +1,6 @@
 use alloy_primitives::{Address, Bytes, B256, U256};
+use alloy_rpc_types_anvil::{Forking, Metadata};
 use jsonrpsee::{core::RpcResult, proc_macros::rpc};
-use reth_rpc_types::anvil::{Forking, Metadata};
 
 /// Hardhat rpc interface.
 /// https://hardhat.org/hardhat-network/docs/reference#hardhat-network-methods
diff --git a/crates/rpc/rpc-types/Cargo.toml b/crates/rpc/rpc-types/Cargo.toml
index 6119caaac..481f3bf72 100644
--- a/crates/rpc/rpc-types/Cargo.toml
+++ b/crates/rpc/rpc-types/Cargo.toml
@@ -17,7 +17,6 @@ workspace = true
 alloy-primitives = { workspace = true, features = ["rand", "rlp", "serde"] }
 alloy-rpc-types.workspace = true
 alloy-rpc-types-admin.workspace = true
-alloy-rpc-types-anvil.workspace = true
 alloy-rpc-types-beacon = { workspace = true, optional = true }
 alloy-rpc-types-trace.workspace = true
 alloy-rpc-types-debug.workspace = true
diff --git a/crates/rpc/rpc-types/src/lib.rs b/crates/rpc/rpc-types/src/lib.rs
index d6d444858..885d50e9d 100644
--- a/crates/rpc/rpc-types/src/lib.rs
+++ b/crates/rpc/rpc-types/src/lib.rs
@@ -33,9 +33,6 @@ pub mod trace {
 // re-export admin
 pub use alloy_rpc_types_admin as admin;
 
-// Anvil specific rpc types coming from alloy.
-pub use alloy_rpc_types_anvil as anvil;
-
 // re-export beacon
 #[cfg(feature = "jsonrpsee-types")]
 pub use alloy_rpc_types_beacon as beacon;