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

This commit is contained in:
Matthias Seitz
2024-11-14 18:15:27 +01:00
committed by GitHub
parent b1635fcba2
commit bd29f82567
5 changed files with 9 additions and 8 deletions

2
Cargo.lock generated
View File

@ -7311,6 +7311,7 @@ dependencies = [
name = "reth-eth-wire" name = "reth-eth-wire"
version = "1.1.1" version = "1.1.1"
dependencies = [ dependencies = [
"alloy-chains",
"alloy-eips", "alloy-eips",
"alloy-primitives", "alloy-primitives",
"alloy-rlp", "alloy-rlp",
@ -7323,7 +7324,6 @@ dependencies = [
"proptest", "proptest",
"proptest-arbitrary-interop", "proptest-arbitrary-interop",
"rand 0.8.5", "rand 0.8.5",
"reth-chainspec",
"reth-codecs", "reth-codecs",
"reth-ecies", "reth-ecies",
"reth-eth-wire-types", "reth-eth-wire-types",

View File

@ -13,7 +13,6 @@ workspace = true
[dependencies] [dependencies]
# reth # reth
reth-chainspec.workspace = true
reth-codecs.workspace = true reth-codecs.workspace = true
reth-primitives.workspace = true reth-primitives.workspace = true
reth-ecies.workspace = true reth-ecies.workspace = true
@ -23,6 +22,7 @@ reth-network-peers.workspace = true
# ethereum # ethereum
alloy-primitives.workspace = true alloy-primitives.workspace = true
alloy-chains.workspace = true
# metrics # metrics
reth-metrics.workspace = true reth-metrics.workspace = true
@ -69,10 +69,10 @@ arbitrary = [
"reth-primitives/arbitrary", "reth-primitives/arbitrary",
"reth-eth-wire-types/arbitrary", "reth-eth-wire-types/arbitrary",
"dep:arbitrary", "dep:arbitrary",
"reth-chainspec/arbitrary",
"alloy-eips/arbitrary", "alloy-eips/arbitrary",
"alloy-primitives/arbitrary", "alloy-primitives/arbitrary",
"reth-codecs/arbitrary" "reth-codecs/arbitrary",
"alloy-chains/arbitrary"
] ]
serde = [ serde = [
"dep:serde", "dep:serde",
@ -82,7 +82,8 @@ serde = [
"bytes/serde", "bytes/serde",
"rand/serde", "rand/serde",
"secp256k1/serde", "secp256k1/serde",
"reth-codecs/serde" "reth-codecs/serde",
"alloy-chains/serde"
] ]
[[test]] [[test]]

View File

@ -3,8 +3,8 @@
use crate::{ use crate::{
errors::P2PStreamError, message::MessageError, version::ParseVersionError, DisconnectReason, errors::P2PStreamError, message::MessageError, version::ParseVersionError, DisconnectReason,
}; };
use alloy_chains::Chain;
use alloy_primitives::B256; use alloy_primitives::B256;
use reth_chainspec::Chain;
use reth_eth_wire_types::EthVersion; use reth_eth_wire_types::EthVersion;
use reth_primitives::{GotExpected, GotExpectedBoxed, ValidationError}; use reth_primitives::{GotExpected, GotExpectedBoxed, ValidationError};
use std::io; use std::io;

View File

@ -365,9 +365,9 @@ mod tests {
EthMessage, EthStream, EthVersion, HelloMessageWithProtocols, PassthroughCodec, EthMessage, EthStream, EthVersion, HelloMessageWithProtocols, PassthroughCodec,
ProtocolVersion, Status, ProtocolVersion, Status,
}; };
use alloy_chains::NamedChain;
use alloy_primitives::{B256, U256}; use alloy_primitives::{B256, U256};
use futures::{SinkExt, StreamExt}; use futures::{SinkExt, StreamExt};
use reth_chainspec::NamedChain;
use reth_ecies::stream::ECIESStream; use reth_ecies::stream::ECIESStream;
use reth_eth_wire_types::EthNetworkPrimitives; use reth_eth_wire_types::EthNetworkPrimitives;
use reth_network_peers::pk2id; use reth_network_peers::pk2id;

View File

@ -6,8 +6,8 @@ use crate::{
hello::DEFAULT_TCP_PORT, EthVersion, HelloMessageWithProtocols, P2PStream, ProtocolVersion, hello::DEFAULT_TCP_PORT, EthVersion, HelloMessageWithProtocols, P2PStream, ProtocolVersion,
Status, UnauthedP2PStream, Status, UnauthedP2PStream,
}; };
use alloy_chains::Chain;
use alloy_primitives::{B256, U256}; use alloy_primitives::{B256, U256};
use reth_chainspec::Chain;
use reth_network_peers::pk2id; use reth_network_peers::pk2id;
use reth_primitives::{ForkFilter, Head}; use reth_primitives::{ForkFilter, Head};
use secp256k1::{SecretKey, SECP256K1}; use secp256k1::{SecretKey, SECP256K1};