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: enhance error handling in trie_node method

Browse Source 
- Removed redundant helper functions for error conversion in ProofTaskTrieNodeProvider.
- Simplified error handling by directly mapping errors to SparseTrieError, improving code clarity and maintainability.
This commit is contained in:
Yong Kang
2025-10-13 02:11:12 +00:00
parent 87e2af3af1
commit f05c757c6d
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
crates/trie/parallel/src/proof_task.rs
View File

@@ -1080,27 +1080,18 @@ pub enum ProofTaskTrieNodeProvider {
impl TrieNodeProvider for ProofTaskTrieNodeProvider {
fn trie_node(&self, path: &Nibbles) -> Result<Option<RevealedNode>, SparseTrieError> {
/// Helper to convert `ProviderError` to `SparseTrieError`
fn provider_err_to_trie_err(e: ProviderError) -> SparseTrieError {
SparseTrieErrorKind::Other(Box::new(e)).into()
}
/// Helper to convert channel recv error to `SparseTrieError`
fn recv_err_to_trie_err(_: std::sync::mpsc::RecvError) -> SparseTrieError {
SparseTrieErrorKind::Other(Box::new(std::io::Error::other("channel closed"))).into()
}
match self {
Self::AccountNode { handle } => {
let rx =
handle.queue_blinded_account_node(*path).map_err(provider_err_to_trie_err)?;
rx.recv().map_err(recv_err_to_trie_err)?
let rx = handle
.queue_blinded_account_node(*path)
.map_err(|error| SparseTrieErrorKind::Other(Box::new(error)))?;
rx.recv().map_err(|error| SparseTrieErrorKind::Other(Box::new(error)))?
}
Self::StorageNode { handle, account } => {
let rx = handle
.queue_blinded_storage_node(*account, *path)
.map_err(provider_err_to_trie_err)?;
rx.recv().map_err(recv_err_to_trie_err)?
.map_err(|error| SparseTrieErrorKind::Other(Box::new(error)))?;
rx.recv().map_err(|error| SparseTrieErrorKind::Other(Box::new(error)))?
}
}
}