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

chore: rename TrieCursorFactory::storage_tries_cursor to TrieCursorFactory::storage_trie_cursor (#9145)

Browse Source
This commit is contained in:
Roman Krasiuk
2024-06-27 11:41:31 -07:00
committed by GitHub
parent 867be500c7
commit 9fd2cf027f
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/trie/trie/src/trie.rs
View File

@ -491,7 +491,7 @@ where
} }
let mut tracker = TrieTracker::default(); let mut tracker = TrieTracker::default();
let trie_cursor = self.trie_cursor_factory.storage_tries_cursor(self.hashed_address)?; let trie_cursor = self.trie_cursor_factory.storage_trie_cursor(self.hashed_address)?;
let walker = TrieWalker::new(trie_cursor, self.prefix_set).with_updates(retain_updates); let walker = TrieWalker::new(trie_cursor, self.prefix_set).with_updates(retain_updates);
let mut hash_builder = HashBuilder::default().with_updates(retain_updates); let mut hash_builder = HashBuilder::default().with_updates(retain_updates);

2
crates/trie/trie/src/trie_cursor/database_cursors.rs
View File

@ -13,7 +13,7 @@ impl<'a, TX: DbTx> TrieCursorFactory for &'a TX {
Ok(Box::new(DatabaseAccountTrieCursor::new(self.cursor_read::<tables::AccountsTrie>()?))) Ok(Box::new(DatabaseAccountTrieCursor::new(self.cursor_read::<tables::AccountsTrie>()?)))
} }
fn storage_tries_cursor( fn storage_trie_cursor(
&self, &self,
hashed_address: B256, hashed_address: B256,
) -> Result<Box<dyn TrieCursor + '_>, DatabaseError> { ) -> Result<Box<dyn TrieCursor + '_>, DatabaseError> {

2
crates/trie/trie/src/trie_cursor/mod.rs
View File

@ -18,7 +18,7 @@ pub trait TrieCursorFactory {
fn account_trie_cursor(&self) -> Result<Box<dyn TrieCursor + '_>, DatabaseError>; fn account_trie_cursor(&self) -> Result<Box<dyn TrieCursor + '_>, DatabaseError>;
/// Create a storage tries cursor. /// Create a storage tries cursor.
fn storage_tries_cursor( fn storage_trie_cursor(
&self, &self,
hashed_address: B256, hashed_address: B256,
) -> Result<Box<dyn TrieCursor + '_>, DatabaseError>; ) -> Result<Box<dyn TrieCursor + '_>, DatabaseError>;

5
crates/trie/trie/src/trie_cursor/noop.rs
View File

@ -1,6 +1,7 @@
use super::{TrieCursor, TrieCursorFactory}; use super::{TrieCursor, TrieCursorFactory};
use crate::{updates::TrieKey, BranchNodeCompact, Nibbles}; use crate::{updates::TrieKey, BranchNodeCompact, Nibbles};
use reth_db::DatabaseError; use reth_db::DatabaseError;
use reth_primitives::B256;
/// Noop trie cursor factory. /// Noop trie cursor factory.
#[derive(Default, Debug)] #[derive(Default, Debug)]
@ -14,9 +15,9 @@ impl TrieCursorFactory for NoopTrieCursorFactory {
} }
/// Generates a Noop storage trie cursor. /// Generates a Noop storage trie cursor.
fn storage_tries_cursor( fn storage_trie_cursor(
&self, &self,
_hashed_address: reth_primitives::B256, _hashed_address: B256,
) -> Result<Box<dyn TrieCursor + '_>, DatabaseError> { ) -> Result<Box<dyn TrieCursor + '_>, DatabaseError> {
Ok(Box::<NoopStorageTrieCursor>::default()) Ok(Box::<NoopStorageTrieCursor>::default())
} }