diff --git a/substrate/Cargo.toml b/substrate/Cargo.toml index 83979bb2b7..d8b6e280b4 100644 --- a/substrate/Cargo.toml +++ b/substrate/Cargo.toml @@ -1,3 +1,24 @@ +[[bin]] +name = "substrate" +path = "node/src/main.rs" + +[package] +name = "substrate" +version = "0.1.0" +authors = ["Parity Technologies "] +build = "build.rs" + +[dependencies] +error-chain = "0.12" +node-cli = { path = "node/cli" } +futures = "0.1" +ctrlc = { version = "3.0", features = ["termination"] } + +[build-dependencies] +vergen = "0.1" + + + [workspace] members = [ "core/bft", @@ -38,7 +59,6 @@ members = [ "core/test-runtime", "core/telemetry", "core/keystore", - "node", "node/cli", "node/api", "node/consensus", diff --git a/substrate/node/Cargo.toml b/substrate/node/Cargo.toml deleted file mode 100644 index 8746954b5a..0000000000 --- a/substrate/node/Cargo.toml +++ /dev/null @@ -1,18 +0,0 @@ -[[bin]] -name = "substrate" -path = "src/main.rs" - -[package] -name = "substrate" -version = "0.1.0" -authors = ["Parity Technologies "] -build = "build.rs" - -[dependencies] -error-chain = "0.12" -node-cli = { path = "cli" } -futures = "0.1" -ctrlc = { version = "3.0", features = ["termination"] } - -[build-dependencies] -vergen = "0.1" diff --git a/substrate/node/build.rs b/substrate/node/build.rs deleted file mode 100644 index 4e48353aea..0000000000 --- a/substrate/node/build.rs +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2015-2018 Parity Technologies (UK) Ltd. -// This file is part of Substrate. - -// Substrate 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. - -// Substrate 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 Substrate. If not, see . - -extern crate vergen; - -const ERROR_MSG: &'static str = "Failed to generate metadata files"; - -fn main() { - vergen::vergen(vergen::SHORT_SHA).expect(ERROR_MSG); - println!("cargo:rerun-if-changed=../../.git/HEAD"); -}