Merge branch 'master' into v0.2

Author: gavofyork

Cargo.lock

@@ -6,13 +6,17 @@ path = "polkadot/src/main.rs"
 name = "polkadot"
 version = "0.2.0"
 authors = ["Parity Technologies <[email protected]>"]
+build = "build.rs"
 
 [dependencies]
 error-chain = "0.12"
 polkadot-cli = { path = "polkadot/cli" }
 futures = "0.1"
 ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
 
+[build-dependencies]
+vergen = "0.1"
+
 [workspace]
 members = [
 	"polkadot/api",
@@ -29,6 +33,7 @@ members = [
 	"polkadot/service",
 
 	"substrate/bft",
+	"substrate/cli",
 	"substrate/client",
 	"substrate/client/db",
 	"substrate/codec",

Cargo.toml

@@ -0,0 +1,25 @@
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+extern crate vergen;
+
+use vergen::{vergen, OutputFns};
+
+const ERROR_MSG: &'static str = "Failed to generate metadata files";
+
+fn main() {
+	vergen(OutputFns::all()).expect(ERROR_MSG);
+}

build.rs

@@ -3,30 +3,18 @@ name = "polkadot-cli"
 version = "0.2.0"
 authors = ["Parity Technologies <[email protected]>"]
 description = "Polkadot node implementation in Rust."
-build = "build.rs"
 
 [dependencies]
 clap = { version = "~2.32", features = ["yaml"] }
-backtrace = "0.3"
-env_logger = "0.4"
 error-chain = "0.12"
 log = "0.3"
-atty = "0.2"
-regex = "1"
-time = "0.1"
 slog = "^2"
-ansi_term = "0.10"
 lazy_static = "1.0"
-triehash = "0.1"
-ed25519 = { path = "../../substrate/ed25519" }
-app_dirs = "1.2"
 tokio = "0.1.7"
 futures = "0.1.17"
-fdlimit = "0.1"
 parking_lot = "0.4"
-serde_json = "1.0"
-serde = "1.0"
 exit-future = "0.1"
+substrate-cli = { path = "../../substrate/cli" }
 substrate-client = { path = "../../substrate/client" }
 substrate-codec = { path = "../../substrate/codec" }
 substrate-extrinsic-pool = { path = "../../substrate/extrinsic-pool" }
@@ -42,7 +30,4 @@ polkadot-primitives = { path = "../primitives" }
 polkadot-runtime = { path = "../runtime" }
 polkadot-service = { path = "../service" }
 polkadot-transaction-pool = { path = "../transaction-pool" }
-names = "0.11.0"
 
-[build-dependencies]
-clap = "~2.32"

polkadot/cli/Cargo.toml

@@ -17,7 +17,6 @@
 //! Predefined chains.
 
 use service;
-use std::path::PathBuf;
 
 /// The chain specification (this should eventually be replaced by a more general JSON-based chain
 /// specification).
@@ -31,8 +30,6 @@ pub enum ChainSpec {
 	KrummeLanke,
 	/// Whatever the current runtime is with the "global testnet" defaults.
 	StagingTestnet,
-	/// Custom Genesis file.
-	Custom(String),
 }
 
 /// Get a chain config from a spec setting.
@@ -43,32 +40,18 @@ impl ChainSpec {
 			ChainSpec::Development => service::chain_spec::development_config(),
 			ChainSpec::LocalTestnet => service::chain_spec::local_testnet_config(),
 			ChainSpec::StagingTestnet => service::chain_spec::staging_testnet_config(),
-			ChainSpec::Custom(f) => service::ChainSpec::from_json_file(PathBuf::from(f))?,
 		})
 	}
-}
 
-impl<'a> From<&'a str> for ChainSpec {
-	fn from(s: &'a str) -> Self {
+	pub(crate) fn from(s: &str) -> Option<Self> {
 		match s {
-			"dev" => ChainSpec::Development,
-			"local" => ChainSpec::LocalTestnet,
-			"poc-1" => ChainSpec::KrummeLanke,
-			"krummelanke" => ChainSpec::KrummeLanke,
-			"staging" => ChainSpec::StagingTestnet,
-			s => ChainSpec::Custom(s.into()),
+			"dev" => Some(ChainSpec::Development),
+			"local" => Some(ChainSpec::LocalTestnet),
+			"poc-1" => Some(ChainSpec::KrummeLanke),
+			"" | "krummelanke" => Some(ChainSpec::KrummeLanke),
+			"staging" => Some(ChainSpec::StagingTestnet),
+			_ => None,
 		}
 	}
 }
 
-impl From<ChainSpec> for String {
-	fn from(s: ChainSpec) -> String {
-		match s {
-			ChainSpec::Development => "dev".into(),
-			ChainSpec::LocalTestnet => "local".into(),
-			ChainSpec::KrummeLanke => "krummelanke".into(),
-			ChainSpec::StagingTestnet => "staging".into(),
-			ChainSpec::Custom(f) => format!("custom ({})", f),
-		}
-	}
-}