From c2e6938606863e5a6f2fe5fb2ef7d993a1a1c69c Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Thu, 21 Nov 2024 11:41:34 +0100 Subject: [PATCH] chore: move prune event type (#12732) --- Cargo.lock | 2 +- crates/node/events/Cargo.toml | 2 +- crates/node/events/src/node.rs | 2 +- crates/prune/prune/src/event.rs | 12 ------------ crates/prune/prune/src/lib.rs | 2 -- crates/prune/types/src/event.rs | 22 ++++++++++++++++++++++ crates/prune/types/src/lib.rs | 2 ++ 7 files changed, 27 insertions(+), 17 deletions(-) delete mode 100644 crates/prune/prune/src/event.rs create mode 100644 crates/prune/types/src/event.rs diff --git a/Cargo.lock b/Cargo.lock index 017b84f6e..02302e14b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8122,7 +8122,7 @@ dependencies = [ "reth-engine-primitives", "reth-network-api", "reth-primitives-traits", - "reth-prune", + "reth-prune-types", "reth-stages", "reth-static-file-types", "reth-storage-api", diff --git a/crates/node/events/Cargo.toml b/crates/node/events/Cargo.toml index 4b4d912a2..03f3ab172 100644 --- a/crates/node/events/Cargo.toml +++ b/crates/node/events/Cargo.toml @@ -16,7 +16,7 @@ reth-storage-api.workspace = true reth-beacon-consensus.workspace = true reth-network-api.workspace = true reth-stages.workspace = true -reth-prune.workspace = true +reth-prune-types.workspace = true reth-static-file-types.workspace = true reth-primitives-traits.workspace = true reth-engine-primitives.workspace = true diff --git a/crates/node/events/src/node.rs b/crates/node/events/src/node.rs index d7f78ba1f..4528bdeaa 100644 --- a/crates/node/events/src/node.rs +++ b/crates/node/events/src/node.rs @@ -9,7 +9,7 @@ use reth_beacon_consensus::{BeaconConsensusEngineEvent, ConsensusEngineLiveSyncP use reth_engine_primitives::ForkchoiceStatus; use reth_network_api::{NetworkEvent, PeersInfo}; use reth_primitives_traits::{format_gas, format_gas_throughput}; -use reth_prune::PrunerEvent; +use reth_prune_types::PrunerEvent; use reth_stages::{EntitiesCheckpoint, ExecOutput, PipelineEvent, StageCheckpoint, StageId}; use reth_static_file_types::StaticFileProducerEvent; use std::{ diff --git a/crates/prune/prune/src/event.rs b/crates/prune/prune/src/event.rs deleted file mode 100644 index 4f5806e59..000000000 --- a/crates/prune/prune/src/event.rs +++ /dev/null @@ -1,12 +0,0 @@ -use alloy_primitives::BlockNumber; -use reth_prune_types::PrunedSegmentInfo; -use std::time::Duration; - -/// An event emitted by a [Pruner][crate::Pruner]. -#[derive(Debug, PartialEq, Eq, Clone)] -pub enum PrunerEvent { - /// Emitted when pruner started running. - Started { tip_block_number: BlockNumber }, - /// Emitted when pruner finished running. - Finished { tip_block_number: BlockNumber, elapsed: Duration, stats: Vec }, -} diff --git a/crates/prune/prune/src/lib.rs b/crates/prune/prune/src/lib.rs index 5a43afeb5..e6bcbe5e8 100644 --- a/crates/prune/prune/src/lib.rs +++ b/crates/prune/prune/src/lib.rs @@ -12,7 +12,6 @@ mod builder; mod db_ext; mod error; -mod event; mod metrics; mod pruner; pub mod segments; @@ -20,7 +19,6 @@ pub mod segments; use crate::metrics::Metrics; pub use builder::PrunerBuilder; pub use error::PrunerError; -pub use event::PrunerEvent; pub use pruner::{Pruner, PrunerResult, PrunerWithFactory, PrunerWithResult}; // Re-export prune types diff --git a/crates/prune/types/src/event.rs b/crates/prune/types/src/event.rs new file mode 100644 index 000000000..bac5f0d51 --- /dev/null +++ b/crates/prune/types/src/event.rs @@ -0,0 +1,22 @@ +use crate::PrunedSegmentInfo; +use alloy_primitives::BlockNumber; +use std::time::Duration; + +/// An event emitted by a pruner. +#[derive(Debug, PartialEq, Eq, Clone)] +pub enum PrunerEvent { + /// Emitted when pruner started running. + Started { + /// The tip block number before pruning. + tip_block_number: BlockNumber, + }, + /// Emitted when pruner finished running. + Finished { + /// The tip block number before pruning. + tip_block_number: BlockNumber, + /// The elapsed time for the pruning process. + elapsed: Duration, + /// Collected pruning stats. + stats: Vec, + }, +} diff --git a/crates/prune/types/src/lib.rs b/crates/prune/types/src/lib.rs index 0722e760f..82a41f0c2 100644 --- a/crates/prune/types/src/lib.rs +++ b/crates/prune/types/src/lib.rs @@ -9,6 +9,7 @@ #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] mod checkpoint; +mod event; mod limiter; mod mode; mod pruner; @@ -16,6 +17,7 @@ mod segment; mod target; pub use checkpoint::PruneCheckpoint; +pub use event::PrunerEvent; pub use limiter::PruneLimiter; pub use mode::PruneMode; pub use pruner::{