clean up claude progress

This commit is contained in:
Daniel Knopik
2026-04-28 17:20:31 +02:00
parent 3772d2fa5b
commit 132f94c91c
5 changed files with 14 additions and 17 deletions

View File

@@ -607,7 +607,10 @@ impl<T: BeaconChainTypes> DataAvailabilityChecker<T> {
let all_data_columns = KzgVerifiedCustodyDataColumn::reconstruct_columns( let all_data_columns = KzgVerifiedCustodyDataColumn::reconstruct_columns(
&self.kzg, &self.kzg,
&verified_data_columns, verified_data_columns
.into_iter()
.map(|c| c.into_inner())
.collect(),
&self.spec, &self.spec,
) )
.map_err(|e| { .map_err(|e| {

View File

@@ -640,17 +640,11 @@ impl<E: EthSpec> KzgVerifiedCustodyDataColumn<E> {
pub fn reconstruct_columns( pub fn reconstruct_columns(
kzg: &Kzg, kzg: &Kzg,
partial_set_of_columns: &[Self], partial_set_of_columns: Vec<Arc<DataColumnSidecar<E>>>,
spec: &ChainSpec, spec: &ChainSpec,
) -> Result<Vec<KzgVerifiedCustodyDataColumn<E>>, KzgError> { ) -> Result<Vec<KzgVerifiedCustodyDataColumn<E>>, KzgError> {
let all_data_columns = reconstruct_data_columns( let all_data_columns =
kzg, reconstruct_data_columns(kzg, partial_set_of_columns.to_vec(), spec)?;
partial_set_of_columns
.iter()
.map(|d| d.clone_arc())
.collect::<Vec<_>>(),
spec,
)?;
let seen_timestamp = timestamp_now(); let seen_timestamp = timestamp_now();

View File

@@ -317,7 +317,7 @@ impl<T: BeaconChainTypes> PendingPayloadCache<T> {
let all_data_columns = KzgVerifiedCustodyDataColumn::reconstruct_columns( let all_data_columns = KzgVerifiedCustodyDataColumn::reconstruct_columns(
&self.kzg, &self.kzg,
&verified_data_columns, verified_data_columns,
&self.spec, &self.spec,
) )
.map_err(|e| { .map_err(|e| {
@@ -495,7 +495,7 @@ impl<T: BeaconChainTypes> PendingPayloadCache<T> {
} }
pending_components.reconstruction_started = true; pending_components.reconstruction_started = true;
ReconstructColumnsDecision::Yes(pending_components.get_cached_data_columns(block_root)) ReconstructColumnsDecision::Yes(pending_components.get_cached_data_columns(*block_root))
} }
/// This could mean some invalid data columns made it through to the `DataAvailabilityChecker`. /// This could mean some invalid data columns made it through to the `DataAvailabilityChecker`.

View File

@@ -19,7 +19,7 @@ impl<E: EthSpec> PendingColumn<E> {
if let Some(existing_cell) = self.cells.get_mut(index) if let Some(existing_cell) = self.cells.get_mut(index)
&& existing_cell.is_none() && existing_cell.is_none()
{ {
*existing_cell = Some((cell.clone(), proof.clone())); *existing_cell = Some((cell.clone(), proof));
} }
} }
@@ -49,7 +49,7 @@ impl<E: EthSpec> PendingColumn<E> {
}; };
// TODO(gloas): we likely want to go and arc all cells // TODO(gloas): we likely want to go and arc all cells
column.push(cell.clone()); column.push(cell.clone());
kzg_proofs.push(proof.clone()); kzg_proofs.push(proof);
} }
Some(Arc::new(DataColumnSidecar::Gloas(DataColumnSidecarGloas { Some(Arc::new(DataColumnSidecar::Gloas(DataColumnSidecarGloas {

View File

@@ -8,8 +8,8 @@ use std::cmp::Ordering;
use std::collections::HashMap; use std::collections::HashMap;
use std::sync::Arc; use std::sync::Arc;
use tracing::{Span, debug, debug_span}; use tracing::{Span, debug, debug_span};
use types::Slot;
use types::{ChainSpec, ColumnIndex, Epoch, EthSpec, Hash256}; use types::{ChainSpec, ColumnIndex, Epoch, EthSpec, Hash256};
use types::{DataColumnSidecar, Slot};
/// This represents the components of a payload pending data availability. /// This represents the components of a payload pending data availability.
/// ///
@@ -90,8 +90,8 @@ impl<E: EthSpec> PendingComponents<E> {
pub fn num_completed_columns(&self) -> usize { pub fn num_completed_columns(&self) -> usize {
self.verified_data_columns self.verified_data_columns
.iter() .values()
.filter_map(|(_, col)| col.is_complete(self.num_blobs_expected).then_some(())) .filter_map(|col| col.is_complete(self.num_blobs_expected).then_some(()))
.count() .count()
} }