From 19df538c6282cd9fde58c8387e6825f5d67fe06f Mon Sep 17 00:00:00 2001
From: Nikolay Volf <nikvolf@gmail.com>
Date: Wed, 22 Jan 2020 05:53:40 -0800
Subject: [PATCH] More cleanups in node-template (#4705)
* remove and reformat
* remove some more
* commit Cargo.lock
---
substrate/Cargo.lock | 4 --
substrate/bin/node-template/Cargo.toml | 4 --
substrate/bin/node-template/src/chain_spec.rs | 62 ++++++++++---------
3 files changed, 33 insertions(+), 37 deletions(-)
diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock
index 04a7a335953..eadf251f759 100644
--- a/substrate/Cargo.lock
+++ b/substrate/Cargo.lock
@@ -3221,8 +3221,6 @@ dependencies = [
"futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"node-template-runtime 2.0.0",
- "parity-scale-codec 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sc-basic-authorship 0.8.0",
"sc-cli 0.8.0",
"sc-client 0.8.0",
@@ -3237,12 +3235,10 @@ dependencies = [
"sp-core 2.0.0",
"sp-finality-grandpa 2.0.0",
"sp-inherents 2.0.0",
- "sp-io 2.0.0",
"sp-runtime 2.0.0",
"sp-transaction-pool 2.0.0",
"substrate-build-script-utils 2.0.0",
"tokio 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "trie-root 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
"vergen 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
diff --git a/substrate/bin/node-template/Cargo.toml b/substrate/bin/node-template/Cargo.toml
index f956bbb2219..cf3d7509f45 100644
--- a/substrate/bin/node-template/Cargo.toml
+++ b/substrate/bin/node-template/Cargo.toml
@@ -14,10 +14,6 @@ futures = "0.3.1"
ctrlc = { version = "3.1.3", features = ["termination"] }
log = "0.4.8"
tokio = { version = "0.2", features = ["rt-threaded"] }
-parking_lot = "0.9.0"
-codec = { package = "parity-scale-codec", version = "1.0.0" }
-trie-root = "0.15.2"
-sp-io = { version = "2.0.0", path = "../../primitives/io" }
sc-cli = { version = "0.8.0", path = "../../client/cli" }
sp-core = { version = "2.0.0", path = "../../primitives/core" }
sc-executor = { version = "0.8", path = "../../client/executor" }
diff --git a/substrate/bin/node-template/src/chain_spec.rs b/substrate/bin/node-template/src/chain_spec.rs
index fae9feaf511..6afb67547bd 100644
--- a/substrate/bin/node-template/src/chain_spec.rs
+++ b/substrate/bin/node-template/src/chain_spec.rs
@@ -56,17 +56,19 @@ impl Alternative {
Alternative::Development => ChainSpec::from_genesis(
"Development",
"dev",
- || testnet_genesis(vec![
- get_authority_keys_from_seed("Alice"),
- ],
- get_account_id_from_seed::<sr25519::Public>("Alice"),
- vec![
+ || testnet_genesis(
+ vec![
+ get_authority_keys_from_seed("Alice"),
+ ],
get_account_id_from_seed::<sr25519::Public>("Alice"),
- get_account_id_from_seed::<sr25519::Public>("Bob"),
- get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
- get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
- ],
- true),
+ vec![
+ get_account_id_from_seed::<sr25519::Public>("Alice"),
+ get_account_id_from_seed::<sr25519::Public>("Bob"),
+ get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+ get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+ ],
+ true,
+ ),
vec![],
None,
None,
@@ -76,26 +78,28 @@ impl Alternative {
Alternative::LocalTestnet => ChainSpec::from_genesis(
"Local Testnet",
"local_testnet",
- || testnet_genesis(vec![
- get_authority_keys_from_seed("Alice"),
- get_authority_keys_from_seed("Bob"),
- ],
- get_account_id_from_seed::<sr25519::Public>("Alice"),
- vec![
+ || testnet_genesis(
+ vec![
+ get_authority_keys_from_seed("Alice"),
+ get_authority_keys_from_seed("Bob"),
+ ],
get_account_id_from_seed::<sr25519::Public>("Alice"),
- get_account_id_from_seed::<sr25519::Public>("Bob"),
- get_account_id_from_seed::<sr25519::Public>("Charlie"),
- get_account_id_from_seed::<sr25519::Public>("Dave"),
- get_account_id_from_seed::<sr25519::Public>("Eve"),
- get_account_id_from_seed::<sr25519::Public>("Ferdie"),
- get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
- get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
- get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
- get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
- get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
- get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
- ],
- true),
+ vec![
+ get_account_id_from_seed::<sr25519::Public>("Alice"),
+ get_account_id_from_seed::<sr25519::Public>("Bob"),
+ get_account_id_from_seed::<sr25519::Public>("Charlie"),
+ get_account_id_from_seed::<sr25519::Public>("Dave"),
+ get_account_id_from_seed::<sr25519::Public>("Eve"),
+ get_account_id_from_seed::<sr25519::Public>("Ferdie"),
+ get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+ get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+ get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
+ get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
+ get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
+ get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
+ ],
+ true,
+ ),
vec![],
None,
None,
--
GitLab