gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-02 16:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: small refactor of epoch method (#7902)

Browse Source 
Stylistic; mostly using early returns to avoid the nested logic

Which issue # does this PR address?


  Please list or describe the changes introduced by this PR.
This commit is contained in:
kevaundray
2025-09-01 10:21:23 +01:00
committed by GitHub
parent c7492f1c27
commit 9cc3c0553b
1 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
beacon_node/beacon_chain/src/data_availability_checker/overflow_lru_cache.rs
View File

@@ -301,30 +301,28 @@ impl<E: EthSpec> PendingComponents<E> {
}
}
/// Returns the epoch of the block if it is cached, otherwise returns the epoch of the first blob.
/// Returns the epoch of:
/// - The block if it is cached
/// - The first available blob
/// - The first data column
/// Otherwise, returns None
pub fn epoch(&self) -> Option<Epoch> {
self.executed_block
.as_ref()
.map(|pending_block| pending_block.as_block().epoch())
.or_else(|| {
for maybe_blob in self.verified_blobs.iter() {
if maybe_blob.is_some() {
return maybe_blob.as_ref().map(|kzg_verified_blob| {
kzg_verified_blob
.as_blob()
.slot()
.epoch(E::slots_per_epoch())
});
}
}
// Get epoch from cached executed block
if let Some(executed_block) = &self.executed_block {
return Some(executed_block.as_block().epoch());
}
if let Some(kzg_verified_data_column) = self.verified_data_columns.first() {
let epoch = kzg_verified_data_column.as_data_column().epoch();
return Some(epoch);
}
// Or, get epoch from first available blob
if let Some(blob) = self.verified_blobs.iter().flatten().next() {
return Some(blob.as_blob().slot().epoch(E::slots_per_epoch()));
}
None
})
// Or, get epoch from first data column
if let Some(data_column) = self.verified_data_columns.first() {
return Some(data_column.as_data_column().epoch());
}
None
}
pub fn status_str(