diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs index 773e761ecae..94fa175c672 100644 --- a/beacon_node/beacon_chain/src/beacon_chain.rs +++ b/beacon_node/beacon_chain/src/beacon_chain.rs @@ -3246,7 +3246,7 @@ impl BeaconChain { } /// Checks if the provided data column can make any cached blocks available, and imports immediately - /// if so, otherwise caches the blob in the data availability checker. + /// if so, otherwise caches the data column in the data availability checker. async fn check_gossip_data_column_availability_and_import( self: &Arc, data_column: GossipVerifiedDataColumn, diff --git a/beacon_node/beacon_chain/src/block_verification_types.rs b/beacon_node/beacon_chain/src/block_verification_types.rs index bd840b9337e..e9d216b6ee8 100644 --- a/beacon_node/beacon_chain/src/block_verification_types.rs +++ b/beacon_node/beacon_chain/src/block_verification_types.rs @@ -68,7 +68,7 @@ enum RpcBlockInner { /// This variant is used with parent lookups and by-range responses. It should have all blobs /// ordered, all block roots matching, and the correct number of blobs for this block. BlockAndBlobs(Arc>, BlobSidecarList), - /// This variant is used with parent lookups and by-range responses. It should have all blobs + /// This variant is used with parent lookups and by-range responses. It should have all data columns /// ordered, all block roots matching, and the correct number of data columns for this block. BlockAndDataColumns(Arc>, DataColumnSidecarList), } diff --git a/beacon_node/beacon_chain/src/data_availability_checker.rs b/beacon_node/beacon_chain/src/data_availability_checker.rs index 2fdab08f039..7635df21bc2 100644 --- a/beacon_node/beacon_chain/src/data_availability_checker.rs +++ b/beacon_node/beacon_chain/src/data_availability_checker.rs @@ -235,7 +235,7 @@ impl DataAvailabilityChecker { .put_kzg_verified_blobs(gossip_blob.block_root(), vec![gossip_blob.into_inner()]) } - /// Check if we've cached other data columns for this block. If it completes a set and we also + /// Check if we've cached other data columns for this block. If it satisfies the custody requirement and we also /// have a block cached, return the `Availability` variant triggering block import. /// Otherwise cache the data column sidecar. /// @@ -358,7 +358,7 @@ impl DataAvailabilityChecker { } } (maybe_blob_list, maybe_data_column_list) => { - let (verified_blobs, verified_data_column) = + let (verified_blobs, verified_data_columns) = if self.blobs_required_for_block(&block) { (maybe_blob_list, maybe_data_column_list) } else { diff --git a/beacon_node/beacon_chain/src/data_availability_checker/availability_view.rs b/beacon_node/beacon_chain/src/data_availability_checker/availability_view.rs index b0879ae60b4..54e2ae79ab2 100644 --- a/beacon_node/beacon_chain/src/data_availability_checker/availability_view.rs +++ b/beacon_node/beacon_chain/src/data_availability_checker/availability_view.rs @@ -136,7 +136,7 @@ pub trait AvailabilityView { /// /// Data columns are only inserted if: /// 1. The data column entry at the index is empty and no block exists. - /// 2. The block exists and its commitment matches the blob's commitment. + /// 2. The block exists and its commitments matches the data column's commitments. fn merge_data_columns( &mut self, data_columns: FixedVector, E::DataColumnCount>, diff --git a/beacon_node/beacon_chain/src/data_column_verification.rs b/beacon_node/beacon_chain/src/data_column_verification.rs index 0aa2d5f3da5..2ea8fe1ae4f 100644 --- a/beacon_node/beacon_chain/src/data_column_verification.rs +++ b/beacon_node/beacon_chain/src/data_column_verification.rs @@ -15,7 +15,7 @@ pub enum GossipDataColumnError { /// /// ## Peer scoring /// - /// We were unable to process this blob due to an internal error. It's + /// We were unable to process this data column due to an internal error. It's /// unclear if the data column is valid. BeaconChainError(BeaconChainError), diff --git a/beacon_node/store/src/hot_cold_store.rs b/beacon_node/store/src/hot_cold_store.rs index d5c99f90aeb..28eaeeb0b1c 100644 --- a/beacon_node/store/src/hot_cold_store.rs +++ b/beacon_node/store/src/hot_cold_store.rs @@ -1524,7 +1524,7 @@ impl, Cold: ItemStore> HotColdDB } } - /// Fetch blobs for a given block from the store. + /// Fetch data_columns for a given block from the store. pub fn get_data_columns( &self, block_root: &Hash256, diff --git a/consensus/types/src/data_column_sidecar.rs b/consensus/types/src/data_column_sidecar.rs index 9cd350a90f5..a6d5b83083e 100644 --- a/consensus/types/src/data_column_sidecar.rs +++ b/consensus/types/src/data_column_sidecar.rs @@ -24,7 +24,7 @@ pub type ColumnIndex = u64; pub type Cell = FixedVector::FieldElementsPerCell>; pub type DataColumn = VariableList, ::MaxBlobsPerBlock>; -/// Container of the data that identifies an individual blob. +/// Container of the data that identifies an individual data column. #[derive( Serialize, Deserialize, Encode, Decode, TreeHash, Copy, Clone, Debug, PartialEq, Eq, Hash, )]