introduce errors with info (#1834)

polkadot/validation/Cargo.toml

@@ -15,7 +15,6 @@ consensus = { package = "sp-consensus", git = "https://github.com/paritytech/sub
 runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master" }
 futures = "0.3.4"
 log = "0.4.8"
-derive_more = "0.14.1"
 codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
 grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" }
 inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master" }
@@ -26,6 +25,7 @@ block-builder = { package = "sc-block-builder", git = "https://github.com/parity
 trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" }
 babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master" }
+thiserror = "1.0.21"
 
 [dev-dependencies]
 sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }

polkadot/validation/src/error.rs

@@ -16,24 +16,25 @@
 
 //! Errors that can occur during the validation process.
 
+use thiserror::Error;
+
 /// Error type for validation
-#[derive(Debug, derive_more::Display, derive_more::From)]
+#[derive(Debug, Error)]
 pub enum Error {
 	/// Client error
-	Client(sp_blockchain::Error),
+	#[error(transparent)]
+	Client(#[from] sp_blockchain::Error),
 	/// Consensus error
-	Consensus(consensus::error::Error),
+	#[error(transparent)]
+	Consensus(#[from] consensus::error::Error),
 	/// Unexpected error checking inherents
-	#[display(fmt = "Unexpected error while checking inherents: {}", _0)]
+	#[error("Unexpected error while checking inherents: {0}")]
 	InherentError(inherents::Error),
 }
 
-impl std::error::Error for Error {
-	fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-		match self {
-			Error::Client(ref err) => Some(err),
-			Error::Consensus(ref err) => Some(err),
-			_ => None,
-		}
+
+impl std::convert::From<inherents::Error> for Error {
+	fn from(inner: inherents::Error) -> Self {
+		Self::InherentError(inner)
 	}
 }