From b0a39e8abcb9a117510d1dd281fa308253b92c3a Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Wed, 13 Nov 2024 01:06:33 +0100 Subject: [PATCH] chore: import static file types directly (#12490) --- Cargo.lock | 3 +-- crates/node/events/Cargo.toml | 3 +-- crates/node/events/src/node.rs | 5 ++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9748712e2..b6744e1f1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8089,13 +8089,12 @@ dependencies = [ "humantime", "pin-project", "reth-beacon-consensus", - "reth-network", "reth-network-api", "reth-primitives-traits", "reth-provider", "reth-prune", "reth-stages", - "reth-static-file", + "reth-static-file-types", "tokio", "tracing", ] diff --git a/crates/node/events/Cargo.toml b/crates/node/events/Cargo.toml index 6af3d8cbe..cc754d583 100644 --- a/crates/node/events/Cargo.toml +++ b/crates/node/events/Cargo.toml @@ -14,11 +14,10 @@ workspace = true # reth reth-provider.workspace = true reth-beacon-consensus.workspace = true -reth-network = { workspace = true, features = ["serde"] } reth-network-api.workspace = true reth-stages.workspace = true reth-prune.workspace = true -reth-static-file.workspace = true +reth-static-file-types.workspace = true reth-primitives-traits.workspace = true # ethereum diff --git a/crates/node/events/src/node.rs b/crates/node/events/src/node.rs index fb0f4d48d..39c6355e3 100644 --- a/crates/node/events/src/node.rs +++ b/crates/node/events/src/node.rs @@ -8,12 +8,11 @@ use futures::Stream; use reth_beacon_consensus::{ BeaconConsensusEngineEvent, ConsensusEngineLiveSyncProgress, ForkchoiceStatus, }; -use reth_network::NetworkEvent; -use reth_network_api::PeersInfo; +use reth_network_api::{NetworkEvent, PeersInfo}; use reth_primitives_traits::{format_gas, format_gas_throughput}; use reth_prune::PrunerEvent; use reth_stages::{EntitiesCheckpoint, ExecOutput, PipelineEvent, StageCheckpoint, StageId}; -use reth_static_file::StaticFileProducerEvent; +use reth_static_file_types::StaticFileProducerEvent; use std::{ fmt::{Display, Formatter}, future::Future,