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(trie): prefer accepting IntoIterator args (#6772)

Browse Source
This commit is contained in:
Roman Krasiuk
2024-02-24 11:19:38 +01:00
committed by GitHub
parent a7e183d1a5
commit 39abdaa427
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/storage/provider/src/chain.rs
View File

@ -243,7 +243,7 @@ impl Chain {
fn append_trie_updates(&mut self, other_trie_updates: Option<TrieUpdates>) { fn append_trie_updates(&mut self, other_trie_updates: Option<TrieUpdates>) {
if let Some((trie_updates, other)) = self.trie_updates.as_mut().zip(other_trie_updates) { if let Some((trie_updates, other)) = self.trie_updates.as_mut().zip(other_trie_updates) {
// Extend trie updates. // Extend trie updates.
trie_updates.extend(other.into_iter()); trie_updates.extend(other);
} else { } else {
// Reset trie updates as they are no longer valid. // Reset trie updates as they are no longer valid.
self.trie_updates.take(); self.trie_updates.take();

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

@ -259,7 +259,7 @@ where
let (root, storage_slots_walked, updates) = let (root, storage_slots_walked, updates) =
storage_root_calculator.root_with_updates()?; storage_root_calculator.root_with_updates()?;
hashed_entries_walked += storage_slots_walked; hashed_entries_walked += storage_slots_walked;
trie_updates.extend(updates.into_iter()); trie_updates.extend(updates);
root root
} else { } else {
storage_root_calculator.root()? storage_root_calculator.root()?
@ -286,7 +286,7 @@ where
last_account_key: hashed_address, last_account_key: hashed_address,
}; };
trie_updates.extend(walker_updates.into_iter()); trie_updates.extend(walker_updates);
trie_updates.extend_with_account_updates(hash_builder_updates); trie_updates.extend_with_account_updates(hash_builder_updates);
return Ok(StateRootProgress::Progress( return Ok(StateRootProgress::Progress(
@ -304,7 +304,7 @@ where
let (_, walker_updates) = account_node_iter.walker.split(); let (_, walker_updates) = account_node_iter.walker.split();
let (_, hash_builder_updates) = hash_builder.split(); let (_, hash_builder_updates) = hash_builder.split();
trie_updates.extend(walker_updates.into_iter()); trie_updates.extend(walker_updates);
trie_updates.extend_with_account_updates(hash_builder_updates); trie_updates.extend_with_account_updates(hash_builder_updates);
trie_updates.extend_with_deletes( trie_updates.extend_with_deletes(
self.prefix_sets.destroyed_accounts.into_iter().map(TrieKey::StorageTrie), self.prefix_sets.destroyed_accounts.into_iter().map(TrieKey::StorageTrie),
@ -455,7 +455,7 @@ where
let (_, walker_updates) = storage_node_iter.walker.split(); let (_, walker_updates) = storage_node_iter.walker.split();
let mut trie_updates = TrieUpdates::default(); let mut trie_updates = TrieUpdates::default();
trie_updates.extend(walker_updates.into_iter()); trie_updates.extend(walker_updates);
trie_updates.extend_with_storage_updates(self.hashed_address, hash_builder_updates); trie_updates.extend_with_storage_updates(self.hashed_address, hash_builder_updates);
trace!(target: "trie::storage_root", ?root, hashed_address = ?self.hashed_address, "calculated storage root"); trace!(target: "trie::storage_root", ?root, hashed_address = ?self.hashed_address, "calculated storage root");

6
crates/trie/src/updates.rs
View File

@ -75,7 +75,7 @@ impl TrieUpdates {
} }
/// Extend the updates with trie updates. /// Extend the updates with trie updates.
pub fn extend(&mut self, updates: impl Iterator<Item = (TrieKey, TrieOp)>) { pub fn extend(&mut self, updates: impl IntoIterator<Item = (TrieKey, TrieOp)>) {
self.trie_operations.extend(updates); self.trie_operations.extend(updates);
} }
@ -100,8 +100,8 @@ impl TrieUpdates {
} }
/// Extend the updates with deletes. /// Extend the updates with deletes.
pub fn extend_with_deletes(&mut self, keys: impl Iterator<Item = TrieKey>) { pub fn extend_with_deletes(&mut self, keys: impl IntoIterator<Item = TrieKey>) {
self.extend(keys.map(|key| (key, TrieOp::Delete))); self.extend(keys.into_iter().map(|key| (key, TrieOp::Delete)));
} }
/// Flush updates all aggregated updates to the database. /// Flush updates all aggregated updates to the database.