Fix rebase conflicts

beacon_node/beacon_chain/src/attester_cache.rs

@@ -14,6 +14,7 @@ use parking_lot::RwLock;
 use state_processing::state_advance::{partial_state_advance, Error as StateAdvanceError};
 use std::collections::HashMap;
 use std::ops::Range;
+use store::signed_beacon_block::BlobReconstructionError;
 use types::{
     beacon_state::{
         compute_committee_index_in_epoch, compute_committee_range_in_epoch, epoch_committee_count,
@@ -42,7 +43,7 @@ pub enum Error {
     // Boxed to avoid an infinite-size recursion issue.
     BeaconChain(Box<BeaconChainError>),
     MissingBeaconState(Hash256),
-    MissingBlobs,
+    MissingBlobs(BlobReconstructionError),
     FailedToTransitionState(StateAdvanceError),
     CannotAttestToFutureState {
         state_slot: Slot,
@@ -74,6 +75,12 @@ impl From<BeaconChainError> for Error {
     }
 }
 
+impl From<BlobReconstructionError> for Error {
+    fn from(e: BlobReconstructionError) -> Self {
+        Error::MissingBlobs(e)
+    }
+}
+
 /// Stores the minimal amount of data required to compute the committee length for any committee at any
 /// slot in a given `epoch`.
 pub struct CommitteeLengths {