fix chain spec builder compilation (#2521)

This commit is contained in:
André Silva
2019-05-09 17:25:02 +01:00
committed by Bastian Köcher
parent d4eb3ec747
commit 9927c336d3
4 changed files with 2335 additions and 1706 deletions
+10
View File
@@ -352,6 +352,16 @@ name = "cfg-if"
version = "0.1.7" version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "chain-spec-builder"
version = "0.1.0"
dependencies = [
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"node-cli 1.0.0",
"substrate-primitives 1.0.0",
"substrate-service 1.0.0",
]
[[package]] [[package]]
name = "chrono" name = "chrono"
version = "0.4.6" version = "0.4.6"
+1 -1
View File
@@ -85,12 +85,12 @@ members = [
"node/runtime", "node/runtime",
"node-template", "node-template",
"subkey", "subkey",
"test-utils/chain-spec-builder",
] ]
exclude = [ exclude = [
"node/runtime/wasm", "node/runtime/wasm",
"core/executor/wasm", "core/executor/wasm",
"core/test-runtime/wasm", "core/test-runtime/wasm",
"test-utils/chain-spec-builder"
] ]
[badges] [badges]
File diff suppressed because it is too large Load Diff
@@ -8,20 +8,24 @@ fn genesis_constructor() -> chain_spec::GenesisConfig {
let matches = App::from_yaml(yaml).get_matches(); let matches = App::from_yaml(yaml).get_matches();
let authorities = matches.values_of("initial_authority_seed") let authorities = matches.values_of("initial_authority_seed")
.unwrap() .unwrap()
.map(chain_spec::get_authority_id_from_seed) .map(chain_spec::get_authority_keys_from_seed)
.collect(); .collect();
let endowed_accounts = matches.values_of("endowed_account_seed") let endowed_accounts = matches.values_of("endowed_account_seed")
.unwrap() .unwrap()
.map(chain_spec::get_authority_id_from_seed) .map(chain_spec::get_account_id_from_seed)
.collect(); .collect();
let sudo_key_seed = matches.value_of("sudo_key_seed").unwrap(); let sudo_key_seed = matches.value_of("sudo_key_seed").unwrap();
let sudo_key = chain_spec::get_authority_id_from_seed(sudo_key_seed); let sudo_key = chain_spec::get_account_id_from_seed(sudo_key_seed);
let enable_println = true;
chain_spec::testnet_genesis( chain_spec::testnet_genesis(
authorities, authorities,
sudo_key.into(), sudo_key.into(),
Some(endowed_accounts), Some(endowed_accounts),
enable_println,
) )
} }
@@ -34,6 +38,7 @@ fn generate_chain_spec() -> String {
None, None,
None, None,
None, None,
None,
); );
build_spec(chain_spec, false).unwrap() build_spec(chain_spec, false).unwrap()
} }