diff --git a/crates/exex/exex/Cargo.toml b/crates/exex/exex/Cargo.toml index 0d09f0a8c68..add6d75aae9 100644 --- a/crates/exex/exex/Cargo.toml +++ b/crates/exex/exex/Cargo.toml @@ -25,7 +25,6 @@ reth-node-core.workspace = true reth-primitives-traits.workspace = true reth-ethereum-primitives.workspace = true reth-provider.workspace = true -reth-prune-types.workspace = true reth-revm.workspace = true reth-stages-api.workspace = true reth-tasks.workspace = true @@ -76,7 +75,6 @@ serde = [ "rand/serde", "secp256k1/serde", "reth-primitives-traits/serde", - "reth-prune-types/serde", "reth-config/serde", "reth-ethereum-primitives/serde", "reth-chain-state/serde", diff --git a/crates/exex/exex/src/backfill/factory.rs b/crates/exex/exex/src/backfill/factory.rs index 29734b905e2..958477d1ec9 100644 --- a/crates/exex/exex/src/backfill/factory.rs +++ b/crates/exex/exex/src/backfill/factory.rs @@ -3,7 +3,6 @@ use std::{ops::RangeInclusive, time::Duration}; use alloy_primitives::BlockNumber; use reth_node_api::FullNodeComponents; -use reth_prune_types::PruneModes; use reth_stages_api::ExecutionStageThresholds; use super::stream::DEFAULT_PARALLELISM; @@ -13,7 +12,6 @@ use super::stream::DEFAULT_PARALLELISM; pub struct BackfillJobFactory { evm_config: E, provider: P, - prune_modes: PruneModes, thresholds: ExecutionStageThresholds, stream_parallelism: usize, } @@ -24,7 +22,6 @@ impl BackfillJobFactory { Self { evm_config, provider, - prune_modes: PruneModes::default(), thresholds: ExecutionStageThresholds { // Default duration for a database transaction to be considered long-lived is // 60 seconds, so we limit the backfill job to the half of it to be sure we finish @@ -38,12 +35,6 @@ impl BackfillJobFactory { } } - /// Sets the prune modes - pub const fn with_prune_modes(mut self, prune_modes: PruneModes) -> Self { - self.prune_modes = prune_modes; - self - } - /// Sets the thresholds pub const fn with_thresholds(mut self, thresholds: ExecutionStageThresholds) -> Self { self.thresholds = thresholds; @@ -66,7 +57,6 @@ impl BackfillJobFactory { BackfillJob { evm_config: self.evm_config.clone(), provider: self.provider.clone(), - prune_modes: self.prune_modes.clone(), range, thresholds: self.thresholds.clone(), stream_parallelism: self.stream_parallelism, diff --git a/crates/exex/exex/src/backfill/job.rs b/crates/exex/exex/src/backfill/job.rs index 1a294e50659..bdb05ef4c66 100644 --- a/crates/exex/exex/src/backfill/job.rs +++ b/crates/exex/exex/src/backfill/job.rs @@ -15,7 +15,6 @@ use reth_provider::{ BlockReader, Chain, ExecutionOutcome, HeaderProvider, ProviderError, StateProviderFactory, TransactionVariant, }; -use reth_prune_types::PruneModes; use reth_revm::database::StateProviderDatabase; use reth_stages_api::ExecutionStageThresholds; use reth_tracing::tracing::{debug, trace}; @@ -31,7 +30,6 @@ pub(super) type BackfillJobResult = Result; pub struct BackfillJob { pub(crate) evm_config: E, pub(crate) provider: P, - pub(crate) prune_modes: PruneModes, pub(crate) thresholds: ExecutionStageThresholds, pub(crate) range: RangeInclusive, pub(crate) stream_parallelism: usize, diff --git a/crates/exex/exex/src/backfill/stream.rs b/crates/exex/exex/src/backfill/stream.rs index 9d50737f5aa..681c5651fb9 100644 --- a/crates/exex/exex/src/backfill/stream.rs +++ b/crates/exex/exex/src/backfill/stream.rs @@ -13,7 +13,6 @@ use reth_evm::{ use reth_node_api::NodePrimitives; use reth_primitives_traits::RecoveredBlock; use reth_provider::{BlockReader, Chain, StateProviderFactory}; -use reth_prune_types::PruneModes; use reth_stages_api::ExecutionStageThresholds; use reth_tracing::tracing::debug; use std::{ @@ -55,7 +54,6 @@ type BatchBlockStreamItem = Chain; pub struct StreamBackfillJob { evm_config: E, provider: P, - prune_modes: PruneModes, range: RangeInclusive, tasks: BackfillTasks, parallelism: usize, @@ -178,7 +176,6 @@ where let job = Box::new(BackfillJob { evm_config: this.evm_config.clone(), provider: this.provider.clone(), - prune_modes: this.prune_modes.clone(), thresholds: this.thresholds.clone(), range, stream_parallelism: this.parallelism, @@ -205,7 +202,6 @@ impl From> for StreamBackfillJob