Fixed Payload Deserialization in DB (#3758)

beacon_node/store/src/errors.rs

@@ -3,7 +3,7 @@ use crate::config::StoreConfigError;
 use crate::hot_cold_store::HotColdDBError;
 use ssz::DecodeError;
 use state_processing::BlockReplayError;
-use types::{BeaconStateError, Hash256, Slot};
+use types::{BeaconStateError, Hash256, InconsistentFork, Slot};
 
 pub type Result<T> = std::result::Result<T, Error>;
 
@@ -45,6 +45,7 @@ pub enum Error {
     ResyncRequiredForExecutionPayloadSeparation,
     SlotClockUnavailableForMigration,
     V9MigrationFailure(Hash256),
+    InconsistentFork(InconsistentFork),
 }
 
 pub trait HandleUnavailable<T> {
@@ -103,6 +104,12 @@ impl From<BlockReplayError> for Error {
     }
 }
 
+impl From<InconsistentFork> for Error {
+    fn from(e: InconsistentFork) -> Error {
+        Error::InconsistentFork(e)
+    }
+}
+
 #[derive(Debug)]
 pub struct DBError {
     pub message: String,