mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-10 04:01:51 +00:00
resolve merge conflicts between untstable and release-v7.0.0
This commit is contained in:
@@ -317,8 +317,11 @@ impl<T: BeaconChainTypes> LightClientServerCache<T> {
|
||||
metrics::inc_counter(&metrics::LIGHT_CLIENT_SERVER_CACHE_PREV_BLOCK_CACHE_MISS);
|
||||
|
||||
// Compute the value, handling potential errors.
|
||||
// This state should already be cached. By electing not to cache it here
|
||||
// we remove any chance of the light client server from affecting the state cache.
|
||||
// We'd like the light client server to be as minimally invasive as possible.
|
||||
let mut state = store
|
||||
.get_state(block_state_root, Some(block_slot))?
|
||||
.get_state(block_state_root, Some(block_slot), false)?
|
||||
.ok_or_else(|| {
|
||||
BeaconChainError::DBInconsistent(format!("Missing state {:?}", block_state_root))
|
||||
})?;
|
||||
|
||||
Reference in New Issue
Block a user