From 15b10ef95e312732e61a8ce7d1e970f87f4e3a32 Mon Sep 17 00:00:00 2001
From: Gregory Edison <gregory.edison1993@gmail.com>
Date: Mon, 23 Sep 2024 15:30:54 +0200
Subject: [PATCH] remove reth-rpc-types import

---
 Cargo.lock                               |  3 ---
 bin/reth-bench/Cargo.toml                |  1 -
 bin/reth-bench/src/valid_payload.rs      |  4 ++--
 crates/e2e-test-utils/Cargo.toml         |  1 -
 examples/custom-engine-types/Cargo.toml  |  3 +--
 examples/custom-engine-types/src/main.rs | 15 +++++++--------
 6 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 995f36e5e49f..3f19cbdccc2d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2723,7 +2723,6 @@ dependencies = [
  "reth-node-ethereum",
  "reth-payload-builder",
  "reth-primitives",
- "reth-rpc-types",
  "reth-tracing",
  "serde",
  "thiserror",
@@ -6366,7 +6365,6 @@ dependencies = [
  "reth-node-api",
  "reth-node-core",
  "reth-primitives",
- "reth-rpc-types",
  "reth-rpc-types-compat",
  "reth-tracing",
  "serde",
@@ -6917,7 +6915,6 @@ dependencies = [
  "reth-provider",
  "reth-rpc",
  "reth-rpc-layer",
- "reth-rpc-types",
  "reth-rpc-types-compat",
  "reth-stages-types",
  "reth-tokio-util",
diff --git a/bin/reth-bench/Cargo.toml b/bin/reth-bench/Cargo.toml
index e4a532a2cc2a..d9e980f3b0b8 100644
--- a/bin/reth-bench/Cargo.toml
+++ b/bin/reth-bench/Cargo.toml
@@ -18,7 +18,6 @@ reth-cli-runner.workspace = true
 reth-cli-util.workspace = true
 reth-node-core.workspace = true
 reth-node-api.workspace = true
-reth-rpc-types.workspace = true
 reth-rpc-types-compat.workspace = true
 reth-primitives = { workspace = true, features = ["alloy-compat"] }
 reth-tracing.workspace = true
diff --git a/bin/reth-bench/src/valid_payload.rs b/bin/reth-bench/src/valid_payload.rs
index 4c96c43b18cf..51b48227cb2f 100644
--- a/bin/reth-bench/src/valid_payload.rs
+++ b/bin/reth-bench/src/valid_payload.rs
@@ -4,12 +4,12 @@
 
 use alloy_provider::{ext::EngineApi, Network};
 use alloy_rpc_types_engine::{
-    ExecutionPayloadInputV2, ForkchoiceState, ForkchoiceUpdated, PayloadAttributes, PayloadStatus,
+    ExecutionPayload, ExecutionPayloadInputV2, ExecutionPayloadV1, ExecutionPayloadV3,
+    ForkchoiceState, ForkchoiceUpdated, PayloadAttributes, PayloadStatus,
 };
 use alloy_transport::{Transport, TransportResult};
 use reth_node_api::EngineApiMessageVersion;
 use reth_primitives::B256;
-use reth_rpc_types::{ExecutionPayload, ExecutionPayloadV1, ExecutionPayloadV3};
 use tracing::error;
 
 /// An extension trait for providers that implement the engine API, to wait for a VALID response.
diff --git a/crates/e2e-test-utils/Cargo.toml b/crates/e2e-test-utils/Cargo.toml
index d73588748a3a..8f1aa6b7a522 100644
--- a/crates/e2e-test-utils/Cargo.toml
+++ b/crates/e2e-test-utils/Cargo.toml
@@ -26,7 +26,6 @@ reth-tokio-util.workspace = true
 reth-stages-types.workspace = true
 reth-network-peers.workspace = true
 reth-node-ethereum.workspace = true
-reth-rpc-types.workspace = true
 reth-rpc-types-compat.workspace = true
 
 # rpc
diff --git a/examples/custom-engine-types/Cargo.toml b/examples/custom-engine-types/Cargo.toml
index b2be3e1e4cf5..9a949b8367fd 100644
--- a/examples/custom-engine-types/Cargo.toml
+++ b/examples/custom-engine-types/Cargo.toml
@@ -8,7 +8,6 @@ license.workspace = true
 [dependencies]
 reth.workspace = true
 reth-chainspec.workspace = true
-reth-rpc-types.workspace = true
 reth-node-api.workspace = true
 reth-node-core.workspace = true
 reth-primitives.workspace = true
@@ -18,7 +17,7 @@ reth-ethereum-payload-builder.workspace = true
 reth-node-ethereum = { workspace = true, features = ["test-utils"] }
 reth-tracing.workspace = true
 alloy-genesis.workspace = true
-alloy-rpc-types.workspace = true
+alloy-rpc-types = { workspace = true, features = ["engine"] }
 
 eyre.workspace = true
 tokio.workspace = true
diff --git a/examples/custom-engine-types/src/main.rs b/examples/custom-engine-types/src/main.rs
index 94a24121e9ba..6b2e2c8add16 100644
--- a/examples/custom-engine-types/src/main.rs
+++ b/examples/custom-engine-types/src/main.rs
@@ -23,7 +23,13 @@ use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
 use alloy_genesis::Genesis;
-use alloy_rpc_types::Withdrawal;
+use alloy_rpc_types::{
+    engine::{
+        ExecutionPayloadEnvelopeV2, ExecutionPayloadEnvelopeV3, ExecutionPayloadEnvelopeV4,
+        ExecutionPayloadV1, PayloadAttributes as EthPayloadAttributes, PayloadId,
+    },
+    Withdrawal,
+};
 use reth::{
     api::PayloadTypes,
     builder::{
@@ -57,13 +63,6 @@ use reth_payload_builder::{
     PayloadBuilderService,
 };
 use reth_primitives::{Address, Withdrawals, B256};
-use reth_rpc_types::{
-    engine::{
-        ExecutionPayloadEnvelopeV2, ExecutionPayloadEnvelopeV3, ExecutionPayloadEnvelopeV4,
-        PayloadAttributes as EthPayloadAttributes, PayloadId,
-    },
-    ExecutionPayloadV1,
-};
 use reth_tracing::{RethTracer, Tracer};
 
 /// A custom payload attributes type.