Remove node/src/main.rs

Cargo.toml

@@ -1,22 +1,3 @@
-[[bin]]
-name = "substrate"
-path = "node/src/main.rs"
-
-[package]
-name = "substrate"
-version = "2.0.0"
-authors = ["Parity Technologies <[email protected]>"]
-build = "build.rs"
-edition = "2018"
-
-[dependencies]
-cli = { package = "node-cli", path = "node/cli" }
-futures = "0.1.29"
-ctrlc = { version = "3.1.3", features = ["termination"] }
-
-[build-dependencies]
-vergen = "3.0.4"
-
 [workspace]
 members = [
 	"core/authority-discovery",
@@ -124,12 +105,6 @@ members = [
 	"test-utils/chain-spec-builder",
 ]
 
-[badges]
-travis-ci = { repository = "paritytech/substrate", branch = "master" }
-maintenance = { status = "actively-developed" }
-is-it-maintained-issue-resolution = { repository = "paritytech/substrate" }
-is-it-maintained-open-issues = { repository = "paritytech/substrate" }
-
 [profile.release]
 # Substrate runtime requires unwinding.
 panic = "unwind"

node/cli/Cargo.toml

@@ -5,6 +5,17 @@ authors = ["Parity Technologies <[email protected]>"]
 description = "Substrate node implementation in Rust."
 build = "build.rs"
 edition = "2018"
+default-run = "substrate"
+
+[badges]
+travis-ci = { repository = "paritytech/substrate", branch = "master" }
+maintenance = { status = "actively-developed" }
+is-it-maintained-issue-resolution = { repository = "paritytech/substrate" }
+is-it-maintained-open-issues = { repository = "paritytech/substrate" }
+
+[[bin]]
+name = "substrate"
+path = "bin/main.rs"
 
 [dependencies]
 log = "0.4.8"
@@ -51,6 +62,7 @@ im_online = { package = "srml-im-online", path = "../../srml/im-online", default
 serde = { version = "1.0.101", features = [ "derive" ] }
 client_db = { package = "substrate-client-db", path = "../../core/client/db", features = ["kvdb-rocksdb"] }
 offchain = { package = "substrate-offchain", path = "../../core/offchain" }
+ctrlc = { version = "3.1.3", features = ["termination"] }
 
 [dev-dependencies]
 keystore = { package = "substrate-keystore", path = "../../core/keystore" }
@@ -63,3 +75,4 @@ tempfile = "3.1.0"
 [build-dependencies]
 cli = { package = "substrate-cli", path = "../../core/cli" }
 structopt = "0.3.3"
+vergen = "3.0.4"

node/src/main.rs → node/cli/bin/main.rs

@@ -54,5 +54,5 @@ fn main() -> Result<(), cli::error::Error> {
 		support_url: "https://github.com/paritytech/substrate/issues/new",
 	};
 
-	cli::run(std::env::args(), Exit, version)
+	node_cli::run(std::env::args(), Exit, version)
 }

node/cli/build.rs

@@ -15,13 +15,15 @@
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
 use cli::{NoCustom, CoreParams};
-
 use std::{fs, env, path::Path};
-
 use structopt::{StructOpt, clap::Shell};
+use vergen::{ConstantsFlags, generate_cargo_keys};
 
 fn main() {
 	build_shell_completion();
+	generate_cargo_keys(ConstantsFlags::all())
+		.expect("Failed to generate metadata files");
+	println!("cargo:rerun-if-changed=.git/HEAD");
 }
 
 /// Build shell completion scripts for all known shells