Fix rebase conflict

This commit is contained in:
Emilia Hane
2023-02-06 11:01:09 +01:00
parent a211e6afee
commit ce2db355de
7 changed files with 54 additions and 27 deletions

View File

@@ -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(());