github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-04-30 03:01:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(config): remove storage proof worker configuration

Browse Source 
- Eliminated the `storage_proof_workers` field and related constants from `TreeConfig`.
- Updated the default implementation and related methods to reflect the removal, streamlining the configuration structure.
This commit is contained in:
Yong Kang
2025-10-07 07:36:02 +00:00
parent 800dcf6d52
commit 29d48d4e1e
2 changed files with 4 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
crates/engine/primitives/src/config.rs
View File

@@ -20,12 +20,6 @@ pub const DEFAULT_RESERVED_CPU_CORES: usize = 1;
/// Default maximum concurrency for prewarm task.
pub const DEFAULT_PREWARM_MAX_CONCURRENCY: usize = 16;
/// Maximum number of storage proof workers
const MAX_STORAGE_PROOF_WORKERS: usize = 12;
/// Default ratio of storage proof workers to `max_proof_task_concurrency`
const DEFAULT_STORAGE_PROOF_WORKER_RATIO: f32 = 0.5;
const DEFAULT_BLOCK_BUFFER_LIMIT: u32 = 256;
const DEFAULT_MAX_INVALID_HEADER_CACHE_LENGTH: u32 = 256;
const DEFAULT_MAX_EXECUTE_BLOCK_BATCH_SIZE: usize = 4;
@@ -115,9 +109,6 @@ pub struct TreeConfig {
prewarm_max_concurrency: usize,
/// Whether to unwind canonical header to ancestor during forkchoice updates.
allow_unwind_canonical_header: bool,
/// Number of dedicated storage proof workers.
/// If None, defaults to half of `max_proof_task_concurrency`.
storage_proof_workers: Option<usize>,
}
impl Default for TreeConfig {
@@ -144,7 +135,6 @@ impl Default for TreeConfig {
always_process_payload_attributes_on_canonical_head: false,
prewarm_max_concurrency: DEFAULT_PREWARM_MAX_CONCURRENCY,
allow_unwind_canonical_header: false,
storage_proof_workers: None,
}
}
}
@@ -174,7 +164,6 @@ impl TreeConfig {
always_process_payload_attributes_on_canonical_head: bool,
prewarm_max_concurrency: usize,
allow_unwind_canonical_header: bool,
storage_proof_workers: Option<usize>,
) -> Self {
Self {
persistence_threshold,
@@ -198,7 +187,6 @@ impl TreeConfig {
always_process_payload_attributes_on_canonical_head,
prewarm_max_concurrency,
allow_unwind_canonical_header,
storage_proof_workers,
}
}
@@ -464,39 +452,4 @@ impl TreeConfig {
pub const fn prewarm_max_concurrency(&self) -> usize {
self.prewarm_max_concurrency
}
/// Get the number of storage proof workers.
///
/// Defaults to half of `max_proof_task_concurrency`, clamped to valid range and leaving at
/// least one slot for on-demand work.
pub fn storage_proof_workers(&self) -> usize {
let max_allowed = self.max_proof_task_concurrency.saturating_sub(1) as usize;
if max_allowed == 0 {
return 0;
}
self.storage_proof_workers.unwrap_or_else(|| {
let derived = (self.max_proof_task_concurrency as f32 *
DEFAULT_STORAGE_PROOF_WORKER_RATIO) as usize;
let capped = derived.min(MAX_STORAGE_PROOF_WORKERS);
capped.clamp(1, max_allowed)
})
}
/// Set the number of storage proof workers explicitly.
///
/// Value is clamped to the remaining concurrency budget (leaving one on-demand slot).
pub const fn with_storage_proof_workers(mut self, workers: usize) -> Self {
let max_allowed = self.max_proof_task_concurrency.saturating_sub(1) as usize;
let clamped = if workers > MAX_STORAGE_PROOF_WORKERS {
MAX_STORAGE_PROOF_WORKERS
} else if workers > max_allowed {
max_allowed
} else {
workers
};
self.storage_proof_workers = Some(clamped);
self
}
}

5
crates/engine/tree/src/tree/payload_processor/mod.rs
View File

@@ -196,7 +196,10 @@ where
state_root_config.prefix_sets.clone(),
);
let max_proof_task_concurrency = config.max_proof_task_concurrency() as usize;
let storage_worker_count = config.storage_proof_workers();
// Default to half of max concurrency, leaving room for on-demand tasks (Accountproof and blinded nodes)
let storage_worker_count = (max_proof_task_concurrency / 2)
.max(1)
.min(max_proof_task_concurrency.saturating_sub(1));
let proof_task = ProofTaskManager::new(
self.executor.handle().clone(),
state_root_config.consistent_view.clone(),