From 5ce7c59f5eddbe44f969627992714b9eb0c2be5e Mon Sep 17 00:00:00 2001 From: Eitan Seri-Levi Date: Fri, 1 May 2026 11:10:15 +0200 Subject: [PATCH] Rename validate_full_data_columns_with_commitments --- beacon_node/beacon_chain/src/data_availability_checker.rs | 4 ++-- beacon_node/beacon_chain/src/data_column_verification.rs | 6 +++--- beacon_node/beacon_chain/src/kzg_utils.rs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/beacon_node/beacon_chain/src/data_availability_checker.rs b/beacon_node/beacon_chain/src/data_availability_checker.rs index 54f21b97e0..637e8acdc8 100644 --- a/beacon_node/beacon_chain/src/data_availability_checker.rs +++ b/beacon_node/beacon_chain/src/data_availability_checker.rs @@ -33,7 +33,7 @@ use crate::data_column_verification::{ GossipVerifiedDataColumn, KzgVerifiedCustodyDataColumn, KzgVerifiedDataColumn, verify_kzg_for_data_column_list, }; -use crate::kzg_utils::validate_full_data_columns_with_commitments; +use crate::kzg_utils::validate_data_columns_with_commitments; use crate::metrics::{ KZG_DATA_COLUMN_RECONSTRUCTION_ATTEMPTS, KZG_DATA_COLUMN_RECONSTRUCTION_FAILURES, }; @@ -699,7 +699,7 @@ fn verify_columns_against_block( "Gloas block missing signed_execution_payload_bid".to_string(), ) })?; - validate_full_data_columns_with_commitments(kzg, columns.iter(), commitments.as_ref()) + validate_data_columns_with_commitments(kzg, columns.iter(), commitments.as_ref()) .map_err(AvailabilityCheckError::InvalidColumn) } else { verify_kzg_for_data_column_list(columns.iter(), kzg) diff --git a/beacon_node/beacon_chain/src/data_column_verification.rs b/beacon_node/beacon_chain/src/data_column_verification.rs index 08c4bbd5fd..3710937b1d 100644 --- a/beacon_node/beacon_chain/src/data_column_verification.rs +++ b/beacon_node/beacon_chain/src/data_column_verification.rs @@ -3,8 +3,8 @@ use crate::block_verification::{ }; use crate::data_availability_checker::MissingCellsError; use crate::kzg_utils::{ - reconstruct_data_columns, validate_full_data_columns, - validate_full_data_columns_with_commitments, validate_partial_data_columns, + reconstruct_data_columns, validate_data_columns_with_commitments, validate_full_data_columns, + validate_partial_data_columns, }; use crate::observed_data_sidecars::{ Error as ObservedDataSidecarsError, ObservationKey, ObservationStrategy, Observe, @@ -490,7 +490,7 @@ impl KzgVerifiedDataColumn { kzg: &Kzg, ) -> Result, (Option, KzgError)> { let _timer = metrics::start_timer(&metrics::KZG_VERIFICATION_DATA_COLUMN_BATCH_TIMES); - validate_full_data_columns_with_commitments(kzg, data_columns.iter(), kzg_commitments)?; + validate_data_columns_with_commitments(kzg, data_columns.iter(), kzg_commitments)?; Ok(data_columns .into_iter() .map(|column| Self { diff --git a/beacon_node/beacon_chain/src/kzg_utils.rs b/beacon_node/beacon_chain/src/kzg_utils.rs index e1558f050b..14eb7ee07a 100644 --- a/beacon_node/beacon_chain/src/kzg_utils.rs +++ b/beacon_node/beacon_chain/src/kzg_utils.rs @@ -115,7 +115,7 @@ pub fn validate_full_data_columns<'a, E: EthSpec>( /// /// Gloas sidecars do not carry commitments. Their commitments come from the block's /// `ExecutionPayloadBid`. -pub fn validate_full_data_columns_with_commitments<'a, E: EthSpec>( +pub fn validate_data_columns_with_commitments<'a, E: EthSpec>( kzg: &Kzg, data_column_iter: impl Iterator>>, kzg_commitments: &[KzgCommitment],