Update to Substrate master (#271)

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)
 }