From 56c84178f273ca61ce24f9d134e2fdf3fb8347af Mon Sep 17 00:00:00 2001 From: Emilia Hane Date: Mon, 6 Feb 2023 11:11:02 +0100 Subject: [PATCH] Fix conflicts rebasing eip4844 --- beacon_node/beacon_chain/src/beacon_chain.rs | 2 +- .../network/src/beacon_processor/worker/rpc_methods.rs | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs index 514b8410d..622ba407a 100644 --- a/beacon_node/beacon_chain/src/beacon_chain.rs +++ b/beacon_node/beacon_chain/src/beacon_chain.rs @@ -3024,7 +3024,7 @@ impl BeaconChain { // Only store blobs at the data availability boundary, minus any configured epochs // margin, or younger (of higher epoch number). if block_epoch >= import_boundary { - if let Some(blobs) = blobs? { + if let Some(blobs) = blobs { if blobs.blobs.len() > 0 { //FIXME(sean) using this for debugging for now info!(self.log, "Writing blobs to store"; "block_root" => ?block_root); diff --git a/beacon_node/network/src/beacon_processor/worker/rpc_methods.rs b/beacon_node/network/src/beacon_processor/worker/rpc_methods.rs index 0bd4eebcc..01b7cb43b 100644 --- a/beacon_node/network/src/beacon_processor/worker/rpc_methods.rs +++ b/beacon_node/network/src/beacon_processor/worker/rpc_methods.rs @@ -688,12 +688,10 @@ impl Worker { let serve_blobs_from_slot = if start_epoch < data_availability_boundary { // Attempt to serve from the earliest block in our database, falling back to the data // availability boundary - let oldest_blob_slot = self - .chain - .store - .get_blob_info() - .map(|blob_info| blob_info.oldest_blob_slot) - .unwrap_or(data_availability_boundary.start_slot(T::EthSpec::slots_per_epoch())); + let oldest_blob_slot = + self.chain.store.get_blob_info().oldest_blob_slot.unwrap_or( + data_availability_boundary.start_slot(T::EthSpec::slots_per_epoch()), + ); debug!( self.log,