mpved eth-wire inside network mod

Author: Rimeeeeee

Diff for: crates/ethereum/reth/Cargo.toml

@@ -65,7 +65,6 @@ arbitrary = [
     "reth-db?/arbitrary",
     "alloy-rpc-types-eth?/arbitrary",
     "reth-transaction-pool?/arbitrary",
-    "reth-eth-wire?/arbitrary",
 ]
 
 test-utils = [
@@ -83,7 +82,7 @@ test-utils = [
     "reth-transaction-pool?/test-utils",
 ]
 
-full = ["consensus", "evm", "node", "provider", "rpc", "exex", "trie", "pool", "network", "eth-wire"]
+full = ["consensus", "evm", "node", "provider", "rpc", "exex", "trie", "pool", "network"]
 
 alloy-compat = ["reth-ethereum-primitives/alloy-compat"]
 cli = ["dep:reth-ethereum-cli"]
@@ -105,7 +104,6 @@ node = [
     "trie",
 ]
 pool = ["dep:reth-transaction-pool"]
-eth-wire = ["dep:reth-eth-wire"]
 rpc = [
     "dep:reth-rpc",
     "dep:reth-rpc-builder",
@@ -114,7 +112,7 @@ rpc = [
     "dep:alloy-rpc-types-eth",
 ]
 js-tracer = ["rpc", "reth-rpc/js-tracer"]
-network = ["dep:reth-network", "dep:reth-network-api"]
+network = ["dep:reth-network", "dep:reth-network-api", "dep:reth-eth-wire"]
 provider = ["storage-api", "dep:reth-provider", "dep:reth-db"]
 storage-api = ["dep:reth-storage-api"]
 trie = ["dep:reth-trie"]

Diff for: crates/ethereum/reth/src/lib.rs

@@ -62,14 +62,13 @@ pub use reth_exex as exex;
 /// Re-exported reth network types
 #[cfg(feature = "network")]
 pub mod network {
+    #[doc(inline)]
+    pub use reth_eth_wire as eth_wire;
     #[doc(inline)]
     pub use reth_network::*;
     #[doc(inline)]
     pub use reth_network_api as api;
 }
-/// Re-exported eth wire types
-#[cfg(feature = "eth-wire")]
-pub use reth_eth_wire as eth_wire;
 
 /// Re-exported reth provider types
 #[cfg(feature = "provider")]

Diff for: crates/optimism/reth/Cargo.toml

@@ -64,7 +64,6 @@ arbitrary = [
     "reth-primitives-traits/arbitrary",
     "reth-db?/arbitrary",
     "reth-transaction-pool?/arbitrary",
-    "reth-eth-wire?/arbitrary",
 ]
 
 test-utils = [
@@ -81,7 +80,7 @@ test-utils = [
     "reth-transaction-pool?/test-utils",
 ]
 
-full = ["consensus", "evm", "node", "provider", "rpc", "trie", "pool", "network", "eth-wire"]
+full = ["consensus", "evm", "node", "provider", "rpc", "trie", "pool", "network"]
 
 alloy-compat = ["reth-optimism-primitives/alloy-compat"]
 cli = ["dep:reth-optimism-cli"]
@@ -109,9 +108,8 @@ rpc = [
     "dep:reth-optimism-rpc",
 ]
 js-tracer = ["rpc", "reth-rpc/js-tracer"]
-network = ["dep:reth-network", "dep:reth-network-api"]
+network = ["dep:reth-network", "dep:reth-network-api", "dep:reth-eth-wire"]
 provider = ["storage-api", "dep:reth-provider", "dep:reth-db"]
 pool = ["dep:reth-transaction-pool"]
-eth-wire = ["dep:reth-eth-wire"]
 storage-api = ["dep:reth-storage-api"]
 trie = ["dep:reth-trie"]

Diff for: crates/optimism/reth/src/lib.rs

@@ -62,13 +62,12 @@ pub mod evm {
     #[doc(inline)]
     pub use reth_revm as revm;
 }
-/// Re-exported eth wire types
-#[cfg(feature = "eth-wire")]
-pub use reth_eth_wire as eth_wire;
 
 /// Re-exported reth network types
 #[cfg(feature = "network")]
 pub mod network {
+    #[doc(inline)]
+    pub use reth_eth_wire as eth_wire;
     #[doc(inline)]
     pub use reth_network::*;
     #[doc(inline)]

Diff for: examples/custom-rlpx-subprotocol/Cargo.toml

@@ -8,7 +8,7 @@ license.workspace = true
 [dependencies]
 tokio = { workspace = true, features = ["full"] }
 futures.workspace = true
-reth-ethereum = { workspace = true, features = ["node", "network", "eth-wire"] }
+reth-ethereum = { workspace = true, features = ["node", "network"] }
 reth.workspace = true
 tokio-stream.workspace = true
 eyre.workspace = true

Diff for: examples/custom-rlpx-subprotocol/src/subprotocol/connection/handler.rs

@@ -2,12 +2,10 @@ use super::CustomRlpxConnection;
 use crate::subprotocol::protocol::{
     event::ProtocolEvent, handler::ProtocolState, proto::CustomRlpxProtoMessage,
 };
-use reth_ethereum::{
+use reth_ethereum::network::{
+    api::{Direction, PeerId},
     eth_wire::{capability::SharedCapabilities, multiplex::ProtocolConnection, protocol::Protocol},
-    network::{
-        api::{Direction, PeerId},
-        protocol::{ConnectionHandler, OnNotSupported},
-    },
+    protocol::{ConnectionHandler, OnNotSupported},
 };
 use tokio::sync::mpsc;
 use tokio_stream::wrappers::UnboundedReceiverStream;

Diff for: examples/custom-rlpx-subprotocol/src/subprotocol/connection/mod.rs

@@ -1,7 +1,7 @@
 use super::protocol::proto::{CustomRlpxProtoMessage, CustomRlpxProtoMessageKind};
 use alloy_primitives::bytes::BytesMut;
 use futures::{Stream, StreamExt};
-use reth_ethereum::eth_wire::multiplex::ProtocolConnection;
+use reth_ethereum::network::eth_wire::multiplex::ProtocolConnection;
 use std::{
     pin::Pin,
     task::{ready, Context, Poll},

Diff for: examples/custom-rlpx-subprotocol/src/subprotocol/protocol/proto.rs

@@ -2,7 +2,7 @@
 //! following [RLPx specs](https://github.com/ethereum/devp2p/blob/master/rlpx.md)
 
 use alloy_primitives::bytes::{Buf, BufMut, BytesMut};
-use reth_ethereum::eth_wire::{protocol::Protocol, Capability};
+use reth_ethereum::network::eth_wire::{protocol::Protocol, Capability};
 
 #[repr(u8)]
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]