From 571d5147102fffe05d715dd5644a97bdbffaccd1 Mon Sep 17 00:00:00 2001 From: suem Date: Fri, 19 Mar 2021 09:08:30 +0800 Subject: [PATCH] change to mwc bad block hash --- chain/src/chain.rs | 2 +- chain/src/error.rs | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/chain/src/chain.rs b/chain/src/chain.rs index 8a4e1c56de..30f8e5615a 100644 --- a/chain/src/chain.rs +++ b/chain/src/chain.rs @@ -250,7 +250,7 @@ impl Chain { /// Known bad block that we must rewind prior to if seen on "current chain". fn rewind_bad_block(&self) -> Result<(), Error> { let hash = - Hash::from_hex("0002897182d8cf7631e86d56ad546b7cf0893bda811592aa9312ae633ce04813")?; + Hash::from_hex("00020440a401086e57e1b7a92ebb0277c7f7fd47a38269ecc6789c2a80333725")?; if let Ok(header) = self.get_block_header(&hash) { if self.is_on_current_chain(&header).is_ok() { diff --git a/chain/src/error.rs b/chain/src/error.rs index 95a6b3395a..fe0f9039e2 100644 --- a/chain/src/error.rs +++ b/chain/src/error.rs @@ -271,6 +271,14 @@ impl From for Error { } } +impl From for Error { + fn from(error: ser::Error) -> Error { + Error { + inner: Context::new(ErrorKind::SerErr(error)), + } + } +} + impl From for Error { fn from(e: secp::Error) -> Error { Error {