jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: relax some bounds (#7762)

Browse Source
This commit is contained in:
Matthias Seitz
2024-04-19 23:40:37 +02:00
committed by GitHub
parent d599ce4683
commit 71f8e678aa
1 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
crates/stages/src/stages/execution.rs
View File

@ -60,7 +60,7 @@ use tracing::*;
/// to [tables::PlainStorageState] /// to [tables::PlainStorageState]
// false positive, we cannot derive it if !DB: Debug. // false positive, we cannot derive it if !DB: Debug.
#[allow(missing_debug_implementations)] #[allow(missing_debug_implementations)]
pub struct ExecutionStage<EF: ExecutorFactory> { pub struct ExecutionStage<EF> {
metrics_tx: Option<MetricEventsSender>, metrics_tx: Option<MetricEventsSender>,
/// The stage's internal executor /// The stage's internal executor
executor_factory: EF, executor_factory: EF,
@ -77,7 +77,7 @@ pub struct ExecutionStage<EF: ExecutorFactory> {
exex_manager_handle: ExExManagerHandle, exex_manager_handle: ExExManagerHandle,
} }
impl<EF: ExecutorFactory> ExecutionStage<EF> { impl<EF> ExecutionStage<EF> {
/// Create new execution stage with specified config. /// Create new execution stage with specified config.
pub fn new( pub fn new(
executor_factory: EF, executor_factory: EF,
@ -115,6 +115,37 @@ impl<EF: ExecutorFactory> ExecutionStage<EF> {
self self
} }
/// Adjusts the prune modes related to changesets.
///
/// This function verifies whether the [`super::MerkleStage`] or Hashing stages will run from
/// scratch. If at least one stage isn't starting anew, it implies that pruning of
/// changesets cannot occur. This is determined by checking the highest clean threshold
/// (`self.external_clean_threshold`) across the stages.
///
/// Given that `start_block` changes with each checkpoint, it's necessary to inspect
/// [`tables::AccountsTrie`] to ensure that [`super::MerkleStage`] hasn't
/// been previously executed.
fn adjust_prune_modes<DB: Database>(
&self,
provider: &DatabaseProviderRW<DB>,
start_block: u64,
max_block: u64,
) -> Result<PruneModes, StageError> {
let mut prune_modes = self.prune_modes.clone();
// If we're not executing MerkleStage from scratch (by threshold or first-sync), then erase
// changeset related pruning configurations
if !(max_block - start_block > self.external_clean_threshold ||
provider.count_entries::<tables::AccountsTrie>()?.is_zero())
{
prune_modes.account_history = None;
prune_modes.storage_history = None;
}
Ok(prune_modes)
}
}
impl<EF: ExecutorFactory> ExecutionStage<EF> {
/// Execute the stage. /// Execute the stage.
pub fn execute_inner<DB: Database>( pub fn execute_inner<DB: Database>(
&mut self, &mut self,
@ -261,35 +292,6 @@ impl<EF: ExecutorFactory> ExecutionStage<EF> {
done, done,
}) })
} }
/// Adjusts the prune modes related to changesets.
///
/// This function verifies whether the [`super::MerkleStage`] or Hashing stages will run from
/// scratch. If at least one stage isn't starting anew, it implies that pruning of
/// changesets cannot occur. This is determined by checking the highest clean threshold
/// (`self.external_clean_threshold`) across the stages.
///
/// Given that `start_block` changes with each checkpoint, it's necessary to inspect
/// [`tables::AccountsTrie`] to ensure that [`super::MerkleStage`] hasn't
/// been previously executed.
fn adjust_prune_modes<DB: Database>(
&self,
provider: &DatabaseProviderRW<DB>,
start_block: u64,
max_block: u64,
) -> Result<PruneModes, StageError> {
let mut prune_modes = self.prune_modes.clone();
// If we're not executing MerkleStage from scratch (by threshold or first-sync), then erase
// changeset related pruning configurations
if !(max_block - start_block > self.external_clean_threshold ||
provider.count_entries::<tables::AccountsTrie>()?.is_zero())
{
prune_modes.account_history = None;
prune_modes.storage_history = None;
}
Ok(prune_modes)
}
} }
fn execution_checkpoint( fn execution_checkpoint(