Fix rebase conflict

beacon_node/store/src/errors.rs

@@ -20,7 +20,7 @@ pub enum Error {
     RlpError(String),
     BlockNotFound(Hash256),
     /// The blobs sidecar mapping to this block root is older than the data availability boundary.
-    BlobsTooOld(Hash256),
+    BlobsTooOld(Hash256, Slot),
     NoContinuationData,
     SplitPointModified(Slot, Slot),
     ConfigError(StoreConfigError),

beacon_node/store/src/hot_cold_store.rs

@@ -1705,7 +1705,7 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
 
         let data_availability_breakpoint: Hash256;
 
-        match blob_info.data_availability_breakpoint {
+        match blob_info.data_availability_boundary {
             Some(breakpoint) => {
                 if breakpoint == blob_info.oldest_blob_parent {
                     return Ok(());

beacon_node/store/src/metadata.rs

@@ -125,7 +125,7 @@ pub struct BlobInfo {
     /// The latest epoch that blobs were pruned.
     pub last_pruned_epoch: Epoch,
     /// The block root of the next blobs to prune from.
-    pub data_availability_breakpoint: Option<Hash256>,
+    pub data_availability_boundary: Option<Hash256>,
     /// The block root of the next blob that needs to be added to fill in the history.
     pub oldest_blob_parent: Hash256,
     /// The slot before which blobs are available.