From 5e0315cce0bbaf3f2b655642bc28966b04dc31d6 Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Mon, 3 Oct 2022 13:40:26 +0200 Subject: [PATCH] move crates into net --- Cargo.toml | 6 +++--- crates/{ => net}/rpc-api/Cargo.toml | 2 +- crates/{ => net}/rpc-api/src/eth.rs | 0 crates/{ => net}/rpc-api/src/eth_filter.rs | 0 crates/{ => net}/rpc-api/src/eth_pubsub.rs | 0 crates/{ => net}/rpc-api/src/lib.rs | 0 crates/{ => net}/rpc-api/src/net.rs | 0 crates/{ => net}/rpc-api/src/trace.rs | 0 crates/{ => net}/rpc-api/src/web3.rs | 0 crates/{ => net}/rpc-types/Cargo.toml | 2 +- crates/{ => net}/rpc-types/src/eth/account.rs | 0 crates/{ => net}/rpc-types/src/eth/block.rs | 0 crates/{ => net}/rpc-types/src/eth/call.rs | 0 crates/{ => net}/rpc-types/src/eth/fee.rs | 0 crates/{ => net}/rpc-types/src/eth/filter.rs | 0 crates/{ => net}/rpc-types/src/eth/index.rs | 0 crates/{ => net}/rpc-types/src/eth/log.rs | 0 crates/{ => net}/rpc-types/src/eth/mod.rs | 0 crates/{ => net}/rpc-types/src/eth/pubsub.rs | 0 crates/{ => net}/rpc-types/src/eth/syncing.rs | 0 crates/{ => net}/rpc-types/src/eth/trace/filter.rs | 0 crates/{ => net}/rpc-types/src/eth/trace/mod.rs | 0 crates/{ => net}/rpc-types/src/eth/trace/parity.rs | 0 crates/{ => net}/rpc-types/src/eth/transaction/mod.rs | 0 crates/{ => net}/rpc-types/src/eth/transaction/receipt.rs | 0 crates/{ => net}/rpc-types/src/eth/transaction/request.rs | 0 crates/{ => net}/rpc-types/src/eth/transaction/typed.rs | 0 crates/{ => net}/rpc-types/src/eth/work.rs | 0 crates/{ => net}/rpc-types/src/lib.rs | 0 crates/{ => net}/rpc/Cargo.toml | 2 +- crates/{ => net}/rpc/src/lib.rs | 0 31 files changed, 6 insertions(+), 6 deletions(-) rename crates/{ => net}/rpc-api/Cargo.toml (87%) rename crates/{ => net}/rpc-api/src/eth.rs (100%) rename crates/{ => net}/rpc-api/src/eth_filter.rs (100%) rename crates/{ => net}/rpc-api/src/eth_pubsub.rs (100%) rename crates/{ => net}/rpc-api/src/lib.rs (100%) rename crates/{ => net}/rpc-api/src/net.rs (100%) rename crates/{ => net}/rpc-api/src/trace.rs (100%) rename crates/{ => net}/rpc-api/src/web3.rs (100%) rename crates/{ => net}/rpc-types/Cargo.toml (87%) rename crates/{ => net}/rpc-types/src/eth/account.rs (100%) rename crates/{ => net}/rpc-types/src/eth/block.rs (100%) rename crates/{ => net}/rpc-types/src/eth/call.rs (100%) rename crates/{ => net}/rpc-types/src/eth/fee.rs (100%) rename crates/{ => net}/rpc-types/src/eth/filter.rs (100%) rename crates/{ => net}/rpc-types/src/eth/index.rs (100%) rename crates/{ => net}/rpc-types/src/eth/log.rs (100%) rename crates/{ => net}/rpc-types/src/eth/mod.rs (100%) rename crates/{ => net}/rpc-types/src/eth/pubsub.rs (100%) rename crates/{ => net}/rpc-types/src/eth/syncing.rs (100%) rename crates/{ => net}/rpc-types/src/eth/trace/filter.rs (100%) rename crates/{ => net}/rpc-types/src/eth/trace/mod.rs (100%) rename crates/{ => net}/rpc-types/src/eth/trace/parity.rs (100%) rename crates/{ => net}/rpc-types/src/eth/transaction/mod.rs (100%) rename crates/{ => net}/rpc-types/src/eth/transaction/receipt.rs (100%) rename crates/{ => net}/rpc-types/src/eth/transaction/request.rs (100%) rename crates/{ => net}/rpc-types/src/eth/transaction/typed.rs (100%) rename crates/{ => net}/rpc-types/src/eth/work.rs (100%) rename crates/{ => net}/rpc-types/src/lib.rs (100%) rename crates/{ => net}/rpc/Cargo.toml (89%) rename crates/{ => net}/rpc/src/lib.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index bc12e9b3f..9e26fa071 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,9 +7,9 @@ edition = "2021" members = [ "crate-template", "crates/net/p2p", - "crates/rpc", - "crates/rpc-api", - "crates/rpc-types", + "crates/net/rpc", + "crates/net/rpc-api", + "crates/net/rpc-types", "crates/primitives", ] diff --git a/crates/rpc-api/Cargo.toml b/crates/net/rpc-api/Cargo.toml similarity index 87% rename from crates/rpc-api/Cargo.toml rename to crates/net/rpc-api/Cargo.toml index 4499436ad..1d0359189 100644 --- a/crates/rpc-api/Cargo.toml +++ b/crates/net/rpc-api/Cargo.toml @@ -11,7 +11,7 @@ Reth RPC interfaces [dependencies] # reth -reth-primitives = { path = "../primitives" } +reth-primitives = { path = "../../primitives" } reth-rpc-types = { path = "../rpc-types" } # misc diff --git a/crates/rpc-api/src/eth.rs b/crates/net/rpc-api/src/eth.rs similarity index 100% rename from crates/rpc-api/src/eth.rs rename to crates/net/rpc-api/src/eth.rs diff --git a/crates/rpc-api/src/eth_filter.rs b/crates/net/rpc-api/src/eth_filter.rs similarity index 100% rename from crates/rpc-api/src/eth_filter.rs rename to crates/net/rpc-api/src/eth_filter.rs diff --git a/crates/rpc-api/src/eth_pubsub.rs b/crates/net/rpc-api/src/eth_pubsub.rs similarity index 100% rename from crates/rpc-api/src/eth_pubsub.rs rename to crates/net/rpc-api/src/eth_pubsub.rs diff --git a/crates/rpc-api/src/lib.rs b/crates/net/rpc-api/src/lib.rs similarity index 100% rename from crates/rpc-api/src/lib.rs rename to crates/net/rpc-api/src/lib.rs diff --git a/crates/rpc-api/src/net.rs b/crates/net/rpc-api/src/net.rs similarity index 100% rename from crates/rpc-api/src/net.rs rename to crates/net/rpc-api/src/net.rs diff --git a/crates/rpc-api/src/trace.rs b/crates/net/rpc-api/src/trace.rs similarity index 100% rename from crates/rpc-api/src/trace.rs rename to crates/net/rpc-api/src/trace.rs diff --git a/crates/rpc-api/src/web3.rs b/crates/net/rpc-api/src/web3.rs similarity index 100% rename from crates/rpc-api/src/web3.rs rename to crates/net/rpc-api/src/web3.rs diff --git a/crates/rpc-types/Cargo.toml b/crates/net/rpc-types/Cargo.toml similarity index 87% rename from crates/rpc-types/Cargo.toml rename to crates/net/rpc-types/Cargo.toml index 4902678e9..2fdbda370 100644 --- a/crates/rpc-types/Cargo.toml +++ b/crates/net/rpc-types/Cargo.toml @@ -10,7 +10,7 @@ Reth RPC types """ [dependencies] # reth -reth-primitives = { path = "../primitives" } +reth-primitives = { path = "../../primitives" } # eth fastrlp = { version = "0.1" } diff --git a/crates/rpc-types/src/eth/account.rs b/crates/net/rpc-types/src/eth/account.rs similarity index 100% rename from crates/rpc-types/src/eth/account.rs rename to crates/net/rpc-types/src/eth/account.rs diff --git a/crates/rpc-types/src/eth/block.rs b/crates/net/rpc-types/src/eth/block.rs similarity index 100% rename from crates/rpc-types/src/eth/block.rs rename to crates/net/rpc-types/src/eth/block.rs diff --git a/crates/rpc-types/src/eth/call.rs b/crates/net/rpc-types/src/eth/call.rs similarity index 100% rename from crates/rpc-types/src/eth/call.rs rename to crates/net/rpc-types/src/eth/call.rs diff --git a/crates/rpc-types/src/eth/fee.rs b/crates/net/rpc-types/src/eth/fee.rs similarity index 100% rename from crates/rpc-types/src/eth/fee.rs rename to crates/net/rpc-types/src/eth/fee.rs diff --git a/crates/rpc-types/src/eth/filter.rs b/crates/net/rpc-types/src/eth/filter.rs similarity index 100% rename from crates/rpc-types/src/eth/filter.rs rename to crates/net/rpc-types/src/eth/filter.rs diff --git a/crates/rpc-types/src/eth/index.rs b/crates/net/rpc-types/src/eth/index.rs similarity index 100% rename from crates/rpc-types/src/eth/index.rs rename to crates/net/rpc-types/src/eth/index.rs diff --git a/crates/rpc-types/src/eth/log.rs b/crates/net/rpc-types/src/eth/log.rs similarity index 100% rename from crates/rpc-types/src/eth/log.rs rename to crates/net/rpc-types/src/eth/log.rs diff --git a/crates/rpc-types/src/eth/mod.rs b/crates/net/rpc-types/src/eth/mod.rs similarity index 100% rename from crates/rpc-types/src/eth/mod.rs rename to crates/net/rpc-types/src/eth/mod.rs diff --git a/crates/rpc-types/src/eth/pubsub.rs b/crates/net/rpc-types/src/eth/pubsub.rs similarity index 100% rename from crates/rpc-types/src/eth/pubsub.rs rename to crates/net/rpc-types/src/eth/pubsub.rs diff --git a/crates/rpc-types/src/eth/syncing.rs b/crates/net/rpc-types/src/eth/syncing.rs similarity index 100% rename from crates/rpc-types/src/eth/syncing.rs rename to crates/net/rpc-types/src/eth/syncing.rs diff --git a/crates/rpc-types/src/eth/trace/filter.rs b/crates/net/rpc-types/src/eth/trace/filter.rs similarity index 100% rename from crates/rpc-types/src/eth/trace/filter.rs rename to crates/net/rpc-types/src/eth/trace/filter.rs diff --git a/crates/rpc-types/src/eth/trace/mod.rs b/crates/net/rpc-types/src/eth/trace/mod.rs similarity index 100% rename from crates/rpc-types/src/eth/trace/mod.rs rename to crates/net/rpc-types/src/eth/trace/mod.rs diff --git a/crates/rpc-types/src/eth/trace/parity.rs b/crates/net/rpc-types/src/eth/trace/parity.rs similarity index 100% rename from crates/rpc-types/src/eth/trace/parity.rs rename to crates/net/rpc-types/src/eth/trace/parity.rs diff --git a/crates/rpc-types/src/eth/transaction/mod.rs b/crates/net/rpc-types/src/eth/transaction/mod.rs similarity index 100% rename from crates/rpc-types/src/eth/transaction/mod.rs rename to crates/net/rpc-types/src/eth/transaction/mod.rs diff --git a/crates/rpc-types/src/eth/transaction/receipt.rs b/crates/net/rpc-types/src/eth/transaction/receipt.rs similarity index 100% rename from crates/rpc-types/src/eth/transaction/receipt.rs rename to crates/net/rpc-types/src/eth/transaction/receipt.rs diff --git a/crates/rpc-types/src/eth/transaction/request.rs b/crates/net/rpc-types/src/eth/transaction/request.rs similarity index 100% rename from crates/rpc-types/src/eth/transaction/request.rs rename to crates/net/rpc-types/src/eth/transaction/request.rs diff --git a/crates/rpc-types/src/eth/transaction/typed.rs b/crates/net/rpc-types/src/eth/transaction/typed.rs similarity index 100% rename from crates/rpc-types/src/eth/transaction/typed.rs rename to crates/net/rpc-types/src/eth/transaction/typed.rs diff --git a/crates/rpc-types/src/eth/work.rs b/crates/net/rpc-types/src/eth/work.rs similarity index 100% rename from crates/rpc-types/src/eth/work.rs rename to crates/net/rpc-types/src/eth/work.rs diff --git a/crates/rpc-types/src/lib.rs b/crates/net/rpc-types/src/lib.rs similarity index 100% rename from crates/rpc-types/src/lib.rs rename to crates/net/rpc-types/src/lib.rs diff --git a/crates/rpc/Cargo.toml b/crates/net/rpc/Cargo.toml similarity index 89% rename from crates/rpc/Cargo.toml rename to crates/net/rpc/Cargo.toml index 926526c2d..57fd4fee9 100644 --- a/crates/rpc/Cargo.toml +++ b/crates/net/rpc/Cargo.toml @@ -10,7 +10,7 @@ Reth RPC implementation """ [dependencies] # reth -reth-primitives = { path = "../primitives" } +reth-primitives = { path = "../../primitives" } reth-rpc-api = { path = "../rpc-api" } reth-rpc-types = { path = "../rpc-types" } diff --git a/crates/rpc/src/lib.rs b/crates/net/rpc/src/lib.rs similarity index 100% rename from crates/rpc/src/lib.rs rename to crates/net/rpc/src/lib.rs