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

refactor: BlindedPovider rename (#17208)

Browse Source 
Signed-off-by: Aliaksei Misiukevich <taberlick@gmail.com>
Co-authored-by: Alexey Shekhirin <5773434+shekhirin@users.noreply.github.com>
This commit is contained in:
Aliaksei Misiukevich
2025-07-15 14:40:52 +02:00
committed by GitHub
parent fb9f3cce92
commit fe1d2d2425
17 changed files with 230 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/engine/tree/src/tree/payload_processor/configured_sparse_trie.rs
View File

@@ -3,7 +3,7 @@
use alloy_primitives::B256;
use reth_trie::{Nibbles, TrieNode};
use reth_trie_sparse::{
blinded::BlindedProvider, errors::SparseTrieResult, LeafLookup, LeafLookupError,
errors::SparseTrieResult, provider::TrieNodeProvider, LeafLookup, LeafLookupError,
SerialSparseTrie, SparseTrieInterface, SparseTrieUpdates, TrieMasks,
};
use reth_trie_sparse_parallel::ParallelSparseTrie;
@@ -77,7 +77,7 @@ impl SparseTrieInterface for ConfiguredSparseTrie {
}
}
fn update_leaf<P: BlindedProvider>(
fn update_leaf<P: TrieNodeProvider>(
&mut self,
full_path: Nibbles,
value: Vec<u8>,
@@ -89,7 +89,7 @@ impl SparseTrieInterface for ConfiguredSparseTrie {
}
}
fn remove_leaf<P: BlindedProvider>(
fn remove_leaf<P: TrieNodeProvider>(
&mut self,
full_path: &Nibbles,
provider: P,

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

@@ -29,7 +29,7 @@ use reth_trie_parallel::{
root::ParallelStateRootError,
};
use reth_trie_sparse::{
blinded::{BlindedProvider, BlindedProviderFactory},
provider::{TrieNodeProvider, TrieNodeProviderFactory},
SerialSparseTrie, SparseTrie, SparseTrieInterface,
};
use reth_trie_sparse_parallel::ParallelSparseTrie;
@@ -329,9 +329,9 @@ where
state_root_tx: mpsc::Sender<Result<StateRootComputeOutcome, ParallelStateRootError>>,
sparse_trie: Option<SparseTrie<A>>,
) where
BPF: BlindedProviderFactory + Clone + Send + Sync + 'static,
BPF::AccountNodeProvider: BlindedProvider + Send + Sync,
BPF::StorageNodeProvider: BlindedProvider + Send + Sync,
BPF: TrieNodeProviderFactory + Clone + Send + Sync + 'static,
BPF::AccountNodeProvider: TrieNodeProvider + Send + Sync,
BPF::StorageNodeProvider: TrieNodeProvider + Send + Sync,
A: SparseTrieInterface + Send + Sync + Default + 'static,
ConfiguredSparseTrie: From<A>,
{
@@ -371,9 +371,9 @@ where
state_root_tx: mpsc::Sender<Result<StateRootComputeOutcome, ParallelStateRootError>>,
is_revealed: bool,
) where
BPF: BlindedProviderFactory + Clone + Send + Sync + 'static,
BPF::AccountNodeProvider: BlindedProvider + Send + Sync,
BPF::StorageNodeProvider: BlindedProvider + Send + Sync,
BPF: TrieNodeProviderFactory + Clone + Send + Sync + 'static,
BPF::AccountNodeProvider: TrieNodeProvider + Send + Sync,
BPF::StorageNodeProvider: TrieNodeProvider + Send + Sync,
{
match configured_trie {
ConfiguredSparseTrie::Serial(boxed_serial) => {
@@ -407,9 +407,9 @@ where
stored_accounts_trie: Option<SparseTrie<ConfiguredSparseTrie>>,
use_parallel_for_new: bool,
) where
BPF: BlindedProviderFactory + Clone + Send + Sync + 'static,
BPF::AccountNodeProvider: BlindedProvider + Send + Sync,
BPF::StorageNodeProvider: BlindedProvider + Send + Sync,
BPF: TrieNodeProviderFactory + Clone + Send + Sync + 'static,
BPF::AccountNodeProvider: TrieNodeProvider + Send + Sync,
BPF::StorageNodeProvider: TrieNodeProvider + Send + Sync,
{
let is_revealed = stored_accounts_trie.as_ref().is_some_and(|trie| trie.is_revealed());
match stored_accounts_trie {

22
crates/engine/tree/src/tree/payload_processor/sparse_trie.rs
View File

@@ -9,8 +9,8 @@ use rayon::iter::{ParallelBridge, ParallelIterator};
use reth_trie::{updates::TrieUpdates, Nibbles};
use reth_trie_parallel::root::ParallelStateRootError;
use reth_trie_sparse::{
blinded::{BlindedProvider, BlindedProviderFactory},
errors::{SparseStateTrieResult, SparseTrieErrorKind},
provider::{TrieNodeProvider, TrieNodeProviderFactory},
SerialSparseTrie, SparseStateTrie, SparseTrie, SparseTrieInterface,
};
use std::{
@@ -22,9 +22,9 @@ use tracing::{debug, trace, trace_span};
/// A task responsible for populating the sparse trie.
pub(super) struct SparseTrieTask<BPF, A = SerialSparseTrie, S = SerialSparseTrie>
where
BPF: BlindedProviderFactory + Send + Sync,
BPF::AccountNodeProvider: BlindedProvider + Send + Sync,
BPF::StorageNodeProvider: BlindedProvider + Send + Sync,
BPF: TrieNodeProviderFactory + Send + Sync,
BPF::AccountNodeProvider: TrieNodeProvider + Send + Sync,
BPF::StorageNodeProvider: TrieNodeProvider + Send + Sync,
{
/// Executor used to spawn subtasks.
#[expect(unused)] // TODO use this for spawning trie tasks
@@ -36,15 +36,15 @@ where
/// It's kept as a field on the struct to prevent blocking on de-allocation in [`Self::run`].
pub(super) trie: SparseStateTrie<A, S>,
pub(super) metrics: MultiProofTaskMetrics,
/// Blinded node provider factory.
/// Trie node provider factory.
blinded_provider_factory: BPF,
}
impl<BPF, A, S> SparseTrieTask<BPF, A, S>
where
BPF: BlindedProviderFactory + Send + Sync + Clone,
BPF::AccountNodeProvider: BlindedProvider + Send + Sync,
BPF::StorageNodeProvider: BlindedProvider + Send + Sync,
BPF: TrieNodeProviderFactory + Send + Sync + Clone,
BPF::AccountNodeProvider: TrieNodeProvider + Send + Sync,
BPF::StorageNodeProvider: TrieNodeProvider + Send + Sync,
A: SparseTrieInterface + Send + Sync + Default,
S: SparseTrieInterface + Send + Sync + Default,
{
@@ -191,9 +191,9 @@ pub(crate) fn update_sparse_trie<BPF, A, S>(
blinded_provider_factory: &BPF,
) -> SparseStateTrieResult<Duration>
where
BPF: BlindedProviderFactory + Send + Sync,
BPF::AccountNodeProvider: BlindedProvider + Send + Sync,
BPF::StorageNodeProvider: BlindedProvider + Send + Sync,
BPF: TrieNodeProviderFactory + Send + Sync,
BPF::AccountNodeProvider: TrieNodeProvider + Send + Sync,
BPF::StorageNodeProvider: TrieNodeProvider + Send + Sync,
A: SparseTrieInterface + Send + Sync + Default,
S: SparseTrieInterface + Send + Sync + Default,
{