chore(rpc): move OpEthApi traits into reth-optimism-rpc (#9581)

paradigmxyz · Jul 17, 2024 · 0630621 · 0630621
1 parent 89d0281
commit 0630621
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/optimism/rpc/Cargo.toml b/crates/optimism/rpc/Cargo.toml
@@ -41,8 +41,18 @@ jsonrpsee.workspace = true
 
 # misc
 thiserror.workspace = true
+serde = { workspace = true, features = ["derive"] }
+
+[dev-dependencies]
+serde_json.workspace = true
 
 [features]
+client = [
+    "jsonrpsee/client",
+    "jsonrpsee/async-client",
+    "reth-rpc-eth-api/client"
+]
+
 optimism = [
     "reth-chainspec/optimism",
     "reth-evm-optimism/optimism",

diff --git a/crates/rpc/rpc-api/src/optimism.rs → crates/optimism/rpc/src/api.rs b/crates/rpc/rpc-api/src/optimism.rs → crates/optimism/rpc/src/api.rs
diff --git a/crates/optimism/rpc/src/lib.rs b/crates/optimism/rpc/src/lib.rs
@@ -10,8 +10,10 @@
 // The `optimism` feature must be enabled to use this crate.
 #![cfg(feature = "optimism")]
 
+pub mod api;
 pub mod error;
 pub mod eth;
 
+pub use api::OpEthApiServer;
 pub use error::OpEthApiError;
 pub use eth::{receipt::op_receipt_fields, transaction::OptimismTxMeta, OpEthApi};
diff --git a/crates/rpc/rpc-api/Cargo.toml b/crates/rpc/rpc-api/Cargo.toml
@@ -21,7 +21,6 @@ reth-network-peers.workspace = true
 
 # misc
 jsonrpsee = { workspace = true, features = ["server", "macros"] }
-serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
 serde_json.workspace = true
@@ -32,4 +31,3 @@ client = [
     "jsonrpsee/async-client",
     "reth-rpc-eth-api/client"
 ]
-optimism = ["reth-rpc-eth-api/optimism"]
diff --git a/crates/rpc/rpc-api/src/lib.rs b/crates/rpc/rpc-api/src/lib.rs
@@ -22,7 +22,6 @@ mod ganache;
 mod hardhat;
 mod mev;
 mod net;
-mod optimism;
 mod otterscan;
 mod reth;
 mod rpc;

diff --git a/crates/rpc/rpc/Cargo.toml b/crates/rpc/rpc/Cargo.toml
@@ -89,7 +89,6 @@ optimism = [
     "reth-primitives/optimism",
     "reth-rpc-types-compat/optimism",
     "reth-provider/optimism",
-    "reth-rpc-api/optimism",
     "reth-rpc-eth-api/optimism",
     "reth-revm/optimism",
     "jsonrpsee-types",