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.

Sign up for GitHub

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: replace reth-chainspec dep with alloy chains #12550

Merged
merged 1 commit into from
Nov 14, 2024
Merged

chore: replace reth-chainspec dep with alloy chains #12550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

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

9 changes: 5 additions & 4 deletions crates/net/eth-wire/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ workspace = true

[dependencies]
# reth
reth-chainspec.workspace = true
reth-codecs.workspace = true
reth-primitives.workspace = true
reth-ecies.workspace = true
Expand All @@ -23,6 +22,7 @@ reth-network-peers.workspace = true

# ethereum
alloy-primitives.workspace = true
alloy-chains.workspace = true

# metrics
reth-metrics.workspace = true
Expand Down Expand Up @@ -69,10 +69,10 @@ arbitrary = [
"reth-primitives/arbitrary",
"reth-eth-wire-types/arbitrary",
"dep:arbitrary",
"reth-chainspec/arbitrary",
"alloy-eips/arbitrary",
"alloy-primitives/arbitrary",
"reth-codecs/arbitrary"
"reth-codecs/arbitrary",
"alloy-chains/arbitrary"
]
serde = [
"dep:serde",
Expand All @@ -82,7 +82,8 @@ serde = [
"bytes/serde",
"rand/serde",
"secp256k1/serde",
"reth-codecs/serde"
"reth-codecs/serde",
"alloy-chains/serde"
]

[[test]]
Expand Down
2 changes: 1 addition & 1 deletion crates/net/eth-wire/src/errors/eth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
use crate::{
errors::P2PStreamError, message::MessageError, version::ParseVersionError, DisconnectReason,
};
use alloy_chains::Chain;
use alloy_primitives::B256;
use reth_chainspec::Chain;
use reth_eth_wire_types::EthVersion;
use reth_primitives::{GotExpected, GotExpectedBoxed, ValidationError};
use std::io;
Expand Down
2 changes: 1 addition & 1 deletion crates/net/eth-wire/src/ethstream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,9 +365,9 @@ mod tests {
EthMessage, EthStream, EthVersion, HelloMessageWithProtocols, PassthroughCodec,
ProtocolVersion, Status,
};
use alloy_chains::NamedChain;
use alloy_primitives::{B256, U256};
use futures::{SinkExt, StreamExt};
use reth_chainspec::NamedChain;
use reth_ecies::stream::ECIESStream;
use reth_eth_wire_types::EthNetworkPrimitives;
use reth_network_peers::pk2id;
Expand Down
2 changes: 1 addition & 1 deletion crates/net/eth-wire/src/test_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ use crate::{
hello::DEFAULT_TCP_PORT, EthVersion, HelloMessageWithProtocols, P2PStream, ProtocolVersion,
Status, UnauthedP2PStream,
};
use alloy_chains::Chain;
use alloy_primitives::{B256, U256};
use reth_chainspec::Chain;
use reth_network_peers::pk2id;
use reth_primitives::{ForkFilter, Head};
use secp256k1::{SecretKey, SECP256K1};
Expand Down
Loading