chore: use crates directly in eth-wire (#12554)

paradigmxyz · Nov 14, 2024 · 870ffae · 870ffae
1 parent a7bb1d1
commit 870ffae
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/net/eth-wire/Cargo.toml b/crates/net/eth-wire/Cargo.toml
@@ -14,12 +14,12 @@ workspace = true
 [dependencies]
 # reth
 reth-codecs.workspace = true
-reth-primitives.workspace = true
 reth-primitives-traits.workspace = true
 reth-ecies.workspace = true
 alloy-rlp = { workspace = true, features = ["derive"] }
 reth-eth-wire-types.workspace = true
 reth-network-peers.workspace = true
+reth-ethereum-forks.workspace = true
 
 # ethereum
 alloy-primitives.workspace = true
@@ -45,6 +45,7 @@ arbitrary = { workspace = true, features = ["derive"], optional = true }
 
 [dev-dependencies]
 reth-primitives = { workspace = true, features = ["arbitrary"] }
+reth-primitives-traits = { workspace = true, features = ["arbitrary"] }
 reth-eth-wire-types = { workspace = true, features = ["arbitrary"] }
 reth-tracing.workspace = true
 
@@ -67,14 +68,15 @@ alloy-eips.workspace = true
 
 [features]
 arbitrary = [
-	"reth-primitives/arbitrary",
 	"reth-eth-wire-types/arbitrary",
 	"dep:arbitrary",
 	"alloy-eips/arbitrary",
 	"alloy-primitives/arbitrary",
 	"reth-codecs/arbitrary",
 	"alloy-chains/arbitrary",
-	"reth-primitives-traits/arbitrary"
+	"reth-primitives-traits/arbitrary",
+	"reth-ethereum-forks/arbitrary",
+	"reth-primitives/arbitrary"
 ]
 serde = [
 	"dep:serde",

diff --git a/crates/net/eth-wire/src/errors/eth.rs b/crates/net/eth-wire/src/errors/eth.rs
@@ -6,7 +6,8 @@ use crate::{
 use alloy_chains::Chain;
 use alloy_primitives::B256;
 use reth_eth_wire_types::EthVersion;
-use reth_primitives::{GotExpected, GotExpectedBoxed, ValidationError};
+use reth_ethereum_forks::ValidationError;
+use reth_primitives_traits::{GotExpected, GotExpectedBoxed};
 use std::io;
 
 /// Errors when sending/receiving messages

diff --git a/crates/net/eth-wire/src/errors/p2p.rs b/crates/net/eth-wire/src/errors/p2p.rs
@@ -3,7 +3,7 @@
 use std::io;
 
 use reth_eth_wire_types::{DisconnectReason, UnknownDisconnectReason};
-use reth_primitives::GotExpected;
+use reth_primitives_traits::GotExpected;
 
 use crate::{capability::SharedCapabilityError, ProtocolVersion};
 

diff --git a/crates/net/eth-wire/src/ethstream.rs b/crates/net/eth-wire/src/ethstream.rs
@@ -9,7 +9,8 @@ use alloy_primitives::bytes::{Bytes, BytesMut};
 use futures::{ready, Sink, SinkExt, StreamExt};
 use pin_project::pin_project;
 use reth_eth_wire_types::NetworkPrimitives;
-use reth_primitives::{ForkFilter, GotExpected};
+use reth_ethereum_forks::ForkFilter;
+use reth_primitives_traits::GotExpected;
 use std::{
     pin::Pin,
     task::{Context, Poll},
@@ -370,8 +371,8 @@ mod tests {
     use futures::{SinkExt, StreamExt};
     use reth_ecies::stream::ECIESStream;
     use reth_eth_wire_types::EthNetworkPrimitives;
+    use reth_ethereum_forks::{ForkFilter, Head};
     use reth_network_peers::pk2id;
-    use reth_primitives::{ForkFilter, Head};
     use secp256k1::{SecretKey, SECP256K1};
     use std::time::Duration;
     use tokio::net::{TcpListener, TcpStream};

diff --git a/crates/net/eth-wire/src/multiplex.rs b/crates/net/eth-wire/src/multiplex.rs
@@ -25,7 +25,7 @@ use crate::{
 use bytes::{Bytes, BytesMut};
 use futures::{Sink, SinkExt, Stream, StreamExt, TryStream, TryStreamExt};
 use reth_eth_wire_types::NetworkPrimitives;
-use reth_primitives::ForkFilter;
+use reth_ethereum_forks::ForkFilter;
 use tokio::sync::{mpsc, mpsc::UnboundedSender};
 use tokio_stream::wrappers::UnboundedReceiverStream;
 

diff --git a/crates/net/eth-wire/src/p2pstream.rs b/crates/net/eth-wire/src/p2pstream.rs
@@ -14,7 +14,7 @@ use futures::{Sink, SinkExt, StreamExt};
 use pin_project::pin_project;
 use reth_codecs::add_arbitrary_tests;
 use reth_metrics::metrics::counter;
-use reth_primitives::GotExpected;
+use reth_primitives_traits::GotExpected;
 use std::{
     collections::VecDeque,
     io,

diff --git a/crates/net/eth-wire/src/test_utils.rs b/crates/net/eth-wire/src/test_utils.rs
@@ -8,8 +8,8 @@ use crate::{
 };
 use alloy_chains::Chain;
 use alloy_primitives::{B256, U256};
+use reth_ethereum_forks::{ForkFilter, Head};
 use reth_network_peers::pk2id;
-use reth_primitives::{ForkFilter, Head};
 use secp256k1::{SecretKey, SECP256K1};
 use std::net::SocketAddr;
 use tokio::net::TcpStream;