github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-09 15:28:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

some lints

Browse Source
This commit is contained in:
Alexey Shekhirin
2025-12-17 12:52:35 +00:00
parent 57bfab07d2
commit 1cb5b87e49
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -537,7 +537,7 @@ fn storage_weigher(_key: &Address, value: &Arc<AccountStorageCache>) -> u32 {
}
/// Weigher function for account cache entries.
fn account_weigher(_key: &Address, value: &Option<Account>) -> u32 {
const fn account_weigher(_key: &Address, value: &Option<Account>) -> u32 {
// Account has a fixed size (none, balance, code_hash)
20 + std::mem::size_of_val(value) as u32
}
@@ -638,12 +638,12 @@ impl SavedCache {
}
}
/// Inner data for AccountStorageCache, wrapped in Arc for cheap cloning.
/// Inner data for [`AccountStorageCache`], wrapped in Arc for cheap cloning.
#[derive(Default)]
struct AccountStorageCacheInner {
/// Map of storage keys to their cached values.
slots: PapayaMap<StorageKey, Option<StorageValue>, FbBuildHasher<32>>,
/// Number of slots in the cache (tracked separately for O(1) len()).
/// Number of slots in the cache (tracked separately for O(1) length).
slot_count: AtomicUsize,
}
@@ -808,7 +808,7 @@ mod tests {
let provider = MockEthProvider::default();
provider.extend_accounts(vec![(address, account)]);
let caches = ExecutionCacheBuilder::default().build_caches(1000);
let caches = ExecutionCacheBuilder.build_caches(1000);
let state_provider =
CachedStateProvider::new(provider, caches, CachedStateMetrics::zeroed());
@@ -831,7 +831,7 @@ mod tests {
let provider = MockEthProvider::default();
provider.extend_accounts(vec![(address, account)]);
let caches = ExecutionCacheBuilder::default().build_caches(1000);
let caches = ExecutionCacheBuilder.build_caches(1000);
let state_provider =
CachedStateProvider::new(provider, caches, CachedStateMetrics::zeroed());
@@ -849,7 +849,7 @@ mod tests {
let storage_value = U256::from(1);
// insert into caches directly
let caches = ExecutionCacheBuilder::default().build_caches(1000);
let caches = ExecutionCacheBuilder.build_caches(1000);
caches.insert_storage(address, storage_key, Some(storage_value));
// check that the storage returns the cached value
@@ -864,7 +864,7 @@ mod tests {
let address = Address::random();
// just create empty caches
let caches = ExecutionCacheBuilder::default().build_caches(1000);
let caches = ExecutionCacheBuilder.build_caches(1000);
// check that the storage is not cached
let (slot_status, _) = caches.get_storage(&address, &storage_key);
@@ -879,7 +879,7 @@ mod tests {
let storage_key = StorageKey::random();
// insert into caches directly
let caches = ExecutionCacheBuilder::default().build_caches(1000);
let caches = ExecutionCacheBuilder.build_caches(1000);
caches.insert_storage(address, storage_key, None);
// check that the storage is empty
@@ -890,7 +890,7 @@ mod tests {
// Tests for SavedCache locking mechanism
#[test]
fn test_saved_cache_is_available() {
let execution_cache = ExecutionCacheBuilder::default().build_caches(1000);
let execution_cache = ExecutionCacheBuilder.build_caches(1000);
let cache = SavedCache::new(B256::ZERO, execution_cache, CachedStateMetrics::zeroed());
// Initially, the cache should be available (only one reference)
@@ -905,7 +905,7 @@ mod tests {
#[test]
fn test_saved_cache_multiple_references() {
let execution_cache = ExecutionCacheBuilder::default().build_caches(1000);
let execution_cache = ExecutionCacheBuilder.build_caches(1000);
let cache =
SavedCache::new(B256::from([2u8; 32]), execution_cache, CachedStateMetrics::zeroed());

12
crates/engine/tree/src/tree/cached_state/weighted_cache.rs
View File

@@ -163,7 +163,7 @@ where
pub(crate) fn remove(&self, key: &K) {
let guard = self.inner.map.pin();
if let Some(value) = guard.remove(key) {
let weight = (self.inner.weigher)(key, &value) as usize;
let weight = (self.inner.weigher)(key, value) as usize;
self.inner.current_weight.fetch_sub(weight, Ordering::Relaxed);
self.inner.entry_count.fetch_sub(1, Ordering::Relaxed);
}
@@ -194,6 +194,10 @@ where
/// (e.g., when saving the cache) rather than on every insert.
pub(crate) fn evict_to_capacity(&self) {
let guard = self.inner.map.pin();
let mut queue = match self.inner.eviction_queue.lock() {
Ok(q) => q,
Err(_) => return,
};
loop {
let current = self.inner.current_weight.load(Ordering::Relaxed) as u64;
@@ -203,10 +207,6 @@ where
// Pop the oldest key from the eviction queue
let key = {
let mut queue = match self.inner.eviction_queue.lock() {
Ok(q) => q,
Err(_) => break,
};
match queue.pop_front() {
Some(k) => k,
None => break,
@@ -215,7 +215,7 @@ where
// Remove from the map and update weight
if let Some(value) = guard.remove(&key) {
let weight = (self.inner.weigher)(&key, &value) as usize;
let weight = (self.inner.weigher)(&key, value) as usize;
self.inner.current_weight.fetch_sub(weight, Ordering::Relaxed);
self.inner.entry_count.fetch_sub(1, Ordering::Relaxed);
}

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

@@ -462,7 +462,7 @@ where
cache
} else {
debug!("creating new execution cache on cache miss");
let cache = ExecutionCacheBuilder::default().build_caches(self.cross_block_cache_size);
let cache = ExecutionCacheBuilder.build_caches(self.cross_block_cache_size);
SavedCache::new(parent_hash, cache, CachedStateMetrics::zeroed())
}
}
@@ -559,7 +559,7 @@ where
existing.split()
}
None => (
ExecutionCacheBuilder::default().build_caches(self.cross_block_cache_size),
ExecutionCacheBuilder.build_caches(self.cross_block_cache_size),
CachedStateMetrics::zeroed(),
),
};
@@ -841,7 +841,7 @@ mod tests {
use std::sync::Arc;
fn make_saved_cache(hash: B256) -> SavedCache {
let execution_cache = ExecutionCacheBuilder::default().build_caches(1_000);
let execution_cache = ExecutionCacheBuilder.build_caches(1_000);
SavedCache::new(hash, execution_cache, CachedStateMetrics::zeroed())
}