Merge remote-tracking branch 'origin/unstable' into tree-states

beacon_node/store/src/errors.rs

@@ -2,6 +2,7 @@ use crate::chunked_vector::ChunkError;
 use crate::config::StoreConfigError;
 use crate::hot_cold_store::HotColdDBError;
 use ssz::DecodeError;
+use state_processing::BlockReplayError;
 use types::{BeaconStateError, Hash256, Slot};
 
 #[cfg(feature = "milhouse")]
@@ -42,6 +43,7 @@ pub enum Error {
         expected: Hash256,
         computed: Hash256,
     },
+    BlockReplayError(BlockReplayError),
     #[cfg(feature = "milhouse")]
     MilhouseError(milhouse::Error),
 }
@@ -103,6 +105,12 @@ impl From<milhouse::Error> for Error {
     }
 }
 
+impl From<BlockReplayError> for Error {
+    fn from(e: BlockReplayError) -> Error {
+        Error::BlockReplayError(e)
+    }
+}
+
 #[derive(Debug)]
 pub struct DBError {
     pub message: String,