diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs index 37feb05f8bc44a4a5a29537b197650a648fc0e2e..4eed2a351e05f838379b50df91add8666a267363 100644 --- a/node/src/chain_spec.rs +++ b/node/src/chain_spec.rs @@ -40,7 +40,6 @@ pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Pu .public() } - /// Generate an account ID from seed. pub fn get_account_id_from_seed<TPublic: Public>(seed: &str) -> AccountId where diff --git a/node/src/chain_spec/gtest.rs b/node/src/chain_spec/gtest.rs index 73a9541566d1c5aeabfcfa6337dd3a6a999a094c..8c2ed4f61b755ff08fe3dcf32828ee8216a314eb 100644 --- a/node/src/chain_spec/gtest.rs +++ b/node/src/chain_spec/gtest.rs @@ -146,7 +146,7 @@ pub struct ClientSpec { /// generate development chainspec with Alice validator // there is some code duplication because we can not use ClientSpec -pub fn development_chainspecs(json_file_path: &str) -> Result<ChainSpec, String> { +pub fn development_chainspecs(json_file_path: String) -> Result<ChainSpec, String> { let wasm_binary = WASM_BINARY.ok_or_else(|| "wasm not available".to_string())?; Ok(ChainSpec::from_genesis( // Name @@ -159,7 +159,7 @@ pub fn development_chainspecs(json_file_path: &str) -> Result<ChainSpec, String> move || { let genesis_data = gen_genesis_data::generate_genesis_data::<_, _, SessionKeys, GTestSKP>( - json_file_path.to_owned(), + json_file_path.clone(), get_parameters, Some("Alice".to_owned()), ) @@ -193,7 +193,10 @@ pub fn development_chainspecs(json_file_path: &str) -> Result<ChainSpec, String> /// live chainspecs // one smith must have session keys -pub fn live_chainspecs(client_spec: ClientSpec, json_file_path: &str) -> Result<ChainSpec, String> { +pub fn live_chainspecs( + client_spec: ClientSpec, + json_file_path: String, +) -> Result<ChainSpec, String> { let wasm_binary = WASM_BINARY.ok_or_else(|| "wasm not available".to_string())?; Ok(ChainSpec::from_genesis( // Name @@ -206,7 +209,7 @@ pub fn live_chainspecs(client_spec: ClientSpec, json_file_path: &str) -> Result< move || { let genesis_data = gen_genesis_data::generate_genesis_data::<_, _, SessionKeys, GTestSKP>( - json_file_path.to_owned(), + json_file_path.clone(), get_parameters, None, ) @@ -244,6 +247,7 @@ fn genesis_data_to_gtest_genesis_conf( initial_monetary_mass, memberships, parameters, + common_parameters, session_keys_map, smith_certs_by_receiver, smith_memberships, diff --git a/node/src/command.rs b/node/src/command.rs index 4c6e63058184fe25824c52b238fd3ce421ce7f60..4b369ab52bdc3298797335231be8ebab4dcea1aa 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -137,7 +137,7 @@ impl SubstrateCli for Cli { // otherwise you get a local testnet with generated genesis #[cfg(feature = "gtest")] "gtest_dev" => Box::new(chain_spec::gtest::development_chainspecs( - "resources/gtest.json", + "resources/gtest.json".to_string(), )?), // chainspecs for live network // must have following files in ./node/specs folder or overwrite with env var: @@ -157,7 +157,7 @@ impl SubstrateCli for Cli { // rebuild chainspecs from these files Box::new(chain_spec::gtest::live_chainspecs( client_spec, - "resources/gtest.json", + "resources/gtest.json".to_string(), )?) } // return hardcoded live chainspecs, only with embed feature