Removed superflous error handling

cli/Cargo.toml

@@ -26,7 +26,6 @@ polkadot-node-core-pvf = { path = "../node/core/pvf", optional = true }
 polkadot-performance-test = { path = "../node/test/performance-test", optional = true }
 
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
 frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
 try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
 sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
@@ -48,7 +47,6 @@ wasmtime = ["sc-cli/wasmtime"]
 db = ["service/db"]
 cli = [
 	"clap",
-	"sp-blockchain",
 	"sc-cli",
 	"sc-service",
 	"sc-tracing",

cli/src/command.rs

@@ -436,12 +436,11 @@ pub fn run() -> Result<()> {
 				let aux_revert = Box::new(|client, backend, blocks| {
 					service::revert_backend(client, backend, blocks, config).map_err(|err| {
 						match err {
-							service::Error::Blockchain(err) => err,
+							service::Error::Blockchain(err) => err.into(),
 							// Generic application-specific error.
-							err => sp_blockchain::Error::Application(err.into()),
+							err => sc_cli::Error::Application(err.into()),
 						}
-					})?;
-					Ok(())
+					})
 				});
 				Ok((
 					cmd.run(client, backend, Some(aux_revert)).map_err(Error::SubstrateCli),