gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-30 20:57:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
Daniel Knopik
2026-04-29 13:06:07 +02:00
parent 2d3354551e
commit 7cf76ac7af
19 changed files with 59 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
beacon_node/beacon_chain/src/beacon_chain.rs
View File

@@ -71,7 +71,7 @@ use crate::payload_envelope_verification::EnvelopeError;
use crate::pending_payload_cache::PendingPayloadCache;
use crate::pending_payload_cache::{
Availability as PayloadAvailability,
DataColumnReconstructionResult as DataColumnReconstructionResultV2,
DataColumnReconstructionResult as DataColumnReconstructionResultGloas,
};
use crate::pending_payload_envelopes::PendingPayloadEnvelopes;
use crate::persisted_beacon_chain::PersistedBeaconChain;
@@ -1185,14 +1185,12 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
&self,
block_root: Hash256,
indices: &[ColumnIndex],
fork_name: ForkName,
) -> Result<DataColumnSidecarList<T::EthSpec>, Error> {
let all_cached_columns_opt = if fork_name.gloas_enabled() {
self.pending_payload_cache.get_data_columns(block_root)
} else {
self.data_availability_checker.get_data_columns(block_root)
}
.or_else(|| self.early_attester_cache.get_data_columns(block_root));
let all_cached_columns_opt = self
.pending_payload_cache
.get_data_columns(block_root)
.or_else(|| self.data_availability_checker.get_data_columns(block_root))
.or_else(|| self.early_attester_cache.get_data_columns(block_root));
if let Some(mut all_cached_columns) = all_cached_columns_opt {
all_cached_columns.retain(|col| indices.contains(col.index()));
@@ -3676,7 +3674,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
.map_err(EnvelopeError::from)?;
match result {
DataColumnReconstructionResultV2::Success((
DataColumnReconstructionResultGloas::Success((
availability,
data_columns_to_publish,
)) => {
@@ -3689,8 +3687,8 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
.await
.map(|status| Some((status, data_columns_to_publish)))?)
}
DataColumnReconstructionResultV2::NotStarted(reason)
| DataColumnReconstructionResultV2::RecoveredColumnsNotImported(reason) => {
DataColumnReconstructionResultGloas::NotStarted(reason)
| DataColumnReconstructionResultGloas::RecoveredColumnsNotImported(reason) => {
metrics::inc_counter_vec(
&metrics::KZG_DATA_COLUMN_RECONSTRUCTION_INCOMPLETE_TOTAL,
&[reason],