Update to Substrate master (#271)

polkadot/Cargo.toml

@@ -9,7 +9,6 @@ authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
 [dependencies]
-error-chain = "0.12"
 polkadot-cli = { path = "cli" }
 futures = "0.1"
 ctrlc = { version = "3.0", features = ["termination"] }

polkadot/service/src/lib.rs

@@ -57,7 +57,7 @@ use aura::{import_queue, start_aura, AuraImportQueue, SlotDuration, NothingExtra
 use inherents::InherentDataProviders;
 pub use service::{
 	Roles, PruningMode, TransactionPoolOptions, ComponentClient,
-	ErrorKind, Error, ComponentBlock, LightComponents, FullComponents,
+	Error, ComponentBlock, LightComponents, FullComponents,
 	FullClient, LightClient, Components, Service, ServiceFactory
 };
 pub use service::config::full_version_from_strs;

polkadot/src/main.rs

@@ -22,9 +22,6 @@ extern crate polkadot_cli as cli;
 extern crate ctrlc;
 extern crate futures;
 
-#[macro_use]
-extern crate error_chain;
-
 use cli::{PolkadotService, VersionInfo, TaskExecutor};
 use futures::sync::oneshot;
 use futures::{future, Future};
@@ -58,9 +55,7 @@ impl cli::Worker for Worker {
 	}
 }
 
-quick_main!(run);
-
-fn run() -> cli::error::Result<()> {
+fn main() -> Result<(), cli::error::Error> {
 	let version = VersionInfo {
 		name: "Parity Polkadot",
 		commit: env!("VERGEN_SHA_SHORT"),
@@ -70,5 +65,6 @@ fn run() -> cli::error::Result<()> {
 		description: "Polkadot Relay-chain Client Node",
 		support_url: "https://github.com/paritytech/polkadot/issues/new",
 	};
+
 	cli::run(::std::env::args(), Worker, version)
 }

polkadot/validation/src/error.rs

@@ -23,10 +23,7 @@ use primitives::ed25519::Public as AuthorityId;
 error_chain! {
 	foreign_links {
 		Client(::client::error::Error);
-	}
-
-	links {
-		Consensus(::consensus::error::Error, ::consensus::error::ErrorKind);
+		Consensus(::consensus::error::Error);
 	}
 
 	errors {