Merge pull request #210 from AurevoirXavier/try

Try
darwinia-network · Dec 31, 2019 · 44e7efa · 44e7efa
2 parents 3c6d0be + 2317a6d
commit 44e7efa
Show file tree

Hide file tree

Showing 5 changed files with 230 additions and 116 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "node-cli"
-version = "0.2.0"
+version = "0.4.6"
 authors = ["Darwinia Network <hello@darwinia.network>"]
 description = "Darwinia node implementation in Rust."
 build = "build.rs"

diff --git a/node/cli/res/icefrog.json b/node/cli/res/icefrog.json
diff --git a/node/cli/src/chain_spec.rs b/node/cli/src/chain_spec.rs
@@ -54,7 +54,7 @@ pub struct Extensions {
 pub type ChainSpec = substrate_service::ChainSpec<GenesisConfig, Extensions>;
 
 /// IceFrog testnet generator
-pub fn icefrog_fir_config() -> Result<ChainSpec, String> {
+pub fn icefrog_testnet_config() -> Result<ChainSpec, String> {
 	ChainSpec::from_json_bytes(&include_bytes!("../res/icefrog.json")[..])
 }
 
@@ -308,34 +308,8 @@ pub fn development_config() -> ChainSpec {
 	)
 }
 
-/// Local testnet config (multivalidator Alice + Bob)
+/// IceFrog local testnet config (multivalidator Alice + Bob)
 pub fn local_testnet_config() -> ChainSpec {
-	fn local_testnet_genesis() -> GenesisConfig {
-		darwinia_genesis(
-			vec![
-				get_authority_keys_from_seed("Alice"),
-				get_authority_keys_from_seed("Bob"),
-			],
-			get_account_id_from_seed::<sr25519::Public>("Alice"),
-			None,
-			false,
-		)
-	}
-
-	ChainSpec::from_genesis(
-		"Local Testnet",
-		"local_testnet",
-		local_testnet_genesis,
-		vec![],
-		None,
-		None,
-		None,
-		Default::default(),
-	)
-}
-
-/// IceFrog testnet config (multivalidator Alice + Bob)
-pub fn icefrog_testnet_config() -> ChainSpec {
 	fn icefrog_config_genesis() -> GenesisConfig {
 		darwinia_genesis(
 			vec![

diff --git a/node/cli/src/lib.rs b/node/cli/src/lib.rs
@@ -55,7 +55,7 @@ impl ChainSpec {
 			ChainSpec::Development => chain_spec::development_config(),
 			ChainSpec::LocalTestnet => chain_spec::local_testnet_config(),
 			ChainSpec::StagingTestnet => chain_spec::staging_testnet_config(),
-			ChainSpec::IceFrogTestnet => chain_spec::icefrog_testnet_config(),
+			ChainSpec::IceFrogTestnet => chain_spec::icefrog_testnet_config()?,
 		})
 	}