chore(deps): shrink some deps (paradigmxyz#8376)

mw2000 · Jun 5, 2024 · c6e7103 · c6e7103
1 parent 9e7b55c
commit c6e7103
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/net/network-api/Cargo.toml b/crates/net/network-api/Cargo.toml
@@ -6,19 +6,20 @@ rust-version.workspace = true
 license.workspace = true
 homepage.workspace = true
 repository.workspace = true
-description = "Network interfaces"
+description = "Network interfaces and commonly used types"
 
 [lints]
 workspace = true
 
 [dependencies]
 # reth
-reth-primitives.workspace = true
 reth-eth-wire.workspace = true
 reth-rpc-types.workspace = true
-reth-discv4.workspace = true
 reth-network-types.workspace = true
 
+# ethereum
+alloy-primitives.workspace = true
+
 # eth
 enr = { workspace = true, default-features = false, features = ["rust-secp256k1"] }
 

diff --git a/crates/net/network-api/src/lib.rs b/crates/net/network-api/src/lib.rs
@@ -13,15 +13,16 @@
 )]
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
-use reth_eth_wire::{DisconnectReason, EthVersion, Status};
-use reth_network_types::PeerId;
-use reth_primitives::NodeRecord;
+use reth_eth_wire::{capability::Capabilities, DisconnectReason, EthVersion, Status};
+use reth_rpc_types::NetworkStatus;
 use std::{future::Future, net::SocketAddr, sync::Arc, time::Instant};
 
 pub use error::NetworkError;
 pub use reputation::{Reputation, ReputationChangeKind};
-use reth_eth_wire::capability::Capabilities;
-use reth_rpc_types::NetworkStatus;
+use reth_network_types::NodeRecord;
+
+/// The PeerId type.
+pub type PeerId = alloy_primitives::B512;
 
 /// Network Error
 pub mod error;

diff --git a/crates/net/network-api/src/noop.rs b/crates/net/network-api/src/noop.rs
@@ -4,14 +4,12 @@
 //! generic over it.
 
 use crate::{
-    NetworkError, NetworkInfo, PeerInfo, PeerKind, Peers, PeersInfo, Reputation,
+    NetworkError, NetworkInfo, PeerId, PeerInfo, PeerKind, Peers, PeersInfo, Reputation,
     ReputationChangeKind,
 };
 use enr::{secp256k1::SecretKey, Enr};
-use reth_discv4::DEFAULT_DISCOVERY_PORT;
 use reth_eth_wire::{DisconnectReason, ProtocolVersion};
-use reth_network_types::PeerId;
-use reth_primitives::{Chain, NodeRecord};
+use reth_network_types::NodeRecord;
 use reth_rpc_types::{admin::EthProtocolInfo, NetworkStatus};
 use std::net::{IpAddr, SocketAddr};
 
@@ -24,7 +22,7 @@ pub struct NoopNetwork;
 
 impl NetworkInfo for NoopNetwork {
     fn local_addr(&self) -> SocketAddr {
-        (IpAddr::from(std::net::Ipv4Addr::UNSPECIFIED), DEFAULT_DISCOVERY_PORT).into()
+        (IpAddr::from(std::net::Ipv4Addr::UNSPECIFIED), 30303).into()
     }
 
     async fn network_status(&self) -> Result<NetworkStatus, NetworkError> {
@@ -42,7 +40,8 @@ impl NetworkInfo for NoopNetwork {
     }
 
     fn chain_id(&self) -> u64 {
-        Chain::mainnet().into()
+        // mainnet
+        1
     }
 
     fn is_syncing(&self) -> bool {