rpc: rm useless alloy-rpc-types-anvil reexport (#11094)

Co-authored-by: Emilia Hane <elsaemiliaevahane@gmail.com>
paradigmxyz · Sep 22, 2024 · 405fc43 · 405fc43
1 parent fdcfe6e
commit 405fc43
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;