Merge tag 'v4.5.0' into tree-states

v4.5.0
This commit is contained in:
Michael Sproul
2023-09-26 11:21:44 +10:00
100 changed files with 1584 additions and 1662 deletions

View File

@@ -160,11 +160,11 @@ impl<E: EthSpec> HotColdDB<E, MemoryStore<E>, MemoryStore<E>> {
anchor_info: RwLock::new(None),
cold_db: MemoryStore::open(),
hot_db: MemoryStore::open(),
block_cache: Mutex::new(LruCache::new(block_cache_size)),
block_cache: Mutex::new(LruCache::new(block_cache_size.get())),
state_cache: Mutex::new(StateCache::new(state_cache_size)),
immutable_validators: Arc::new(RwLock::new(Default::default())),
historic_state_cache: Mutex::new(LruCache::new(historic_state_cache_size)),
diff_buffer_cache: Mutex::new(LruCache::new(diff_buffer_cache_size)),
historic_state_cache: Mutex::new(LruCache::new(historic_state_cache_size.get())),
diff_buffer_cache: Mutex::new(LruCache::new(diff_buffer_cache_size.get())),
config,
hierarchy,
spec,
@@ -207,11 +207,11 @@ impl<E: EthSpec> HotColdDB<E, LevelDB<E>, LevelDB<E>> {
anchor_info: RwLock::new(None),
cold_db: LevelDB::open(cold_path)?,
hot_db: LevelDB::open(hot_path)?,
block_cache: Mutex::new(LruCache::new(block_cache_size)),
block_cache: Mutex::new(LruCache::new(block_cache_size.get())),
state_cache: Mutex::new(StateCache::new(state_cache_size)),
immutable_validators: Arc::new(RwLock::new(Default::default())),
historic_state_cache: Mutex::new(LruCache::new(historic_state_cache_size)),
diff_buffer_cache: Mutex::new(LruCache::new(diff_buffer_cache_size)),
historic_state_cache: Mutex::new(LruCache::new(historic_state_cache_size.get())),
diff_buffer_cache: Mutex::new(LruCache::new(diff_buffer_cache_size.get())),
config,
hierarchy,
spec,

View File

@@ -50,7 +50,7 @@ impl<E: EthSpec> StateCache<E> {
pub fn new(capacity: NonZeroUsize) -> Self {
StateCache {
finalized_state: None,
states: LruCache::new(capacity),
states: LruCache::new(capacity.get()),
block_map: BlockMap::default(),
capacity,
max_epoch: Epoch::new(0),