Bring substrate-demo up to date

Cargo.toml

@@ -40,10 +40,16 @@ members = [
 	"substrate/test-runtime",
 	"substrate/telemetry",
 	"substrate/keystore",
+	"demo",
 	"demo/cli",
+	"demo/api",
+	"demo/consensus",
 	"demo/executor",
+	"demo/network",
 	"demo/primitives",
 	"demo/runtime",
+	"demo/service",
+	"demo/transaction-pool",
 	"subkey",
 ]
 exclude = [

demo/Cargo.toml

@@ -0,0 +1,18 @@
+[[bin]]
+name = "substrate"
+path = "src/main.rs"
+
+[package]
+name = "substrate"
+version = "0.1.0"
+authors = ["Parity Technologies <[email protected]>"]
+build = "build.rs"
+
+[dependencies]
+error-chain = "0.12"
+demo-cli = { path = "cli" }
+futures = "0.1"
+ctrlc = { version = "3.0", features = ["termination"] }
+
+[build-dependencies]
+vergen = "0.1"

demo/api/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "demo-api"
+version = "0.1.0"
+authors = ["Parity Technologies <[email protected]>"]
+
+[dependencies]
+demo-runtime = { path = "../runtime" }
+demo-primitives = { path = "../primitives" }
+substrate-client = { path = "../../substrate/client" }
+substrate-primitives = { path = "../../substrate/primitives" }
+
+[dev-dependencies]
+substrate-keyring = { path = "../../substrate/keyring" }