Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): shrink some deps #8376

Merged
merged 1 commit into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions crates/net/network-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }

Expand Down
11 changes: 6 additions & 5 deletions crates/net/network-api/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
11 changes: 5 additions & 6 deletions crates/net/network-api/src/noop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};

Expand All @@ -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> {
Expand All @@ -42,7 +40,8 @@ impl NetworkInfo for NoopNetwork {
}

fn chain_id(&self) -> u64 {
Chain::mainnet().into()
// mainnet
1
}

fn is_syncing(&self) -> bool {
Expand Down
Loading