diff --git a/substrate/node/src/chain_spec.rs b/substrate/node/src/chain_spec.rs index 001061b9..88fc0949 100644 --- a/substrate/node/src/chain_spec.rs +++ b/substrate/node/src/chain_spec.rs @@ -1,24 +1,18 @@ use sc_service::ChainType; use sp_runtime::traits::Verify; -use sp_core::{sr25519, Pair, Public}; - -use sp_runtime::traits::IdentifyAccount; +use sp_core::{Pair as PairTrait, sr25519::Pair}; use serai_runtime::{WASM_BINARY, AccountId, Signature, GenesisConfig, SystemConfig, BalancesConfig}; pub type ChainSpec = sc_service::GenericChainSpec; -type AccountPublic = ::Signer; -fn get_from_seed(seed: &'static str) -> ::Public { - TPublic::Pair::from_string(&format!("//{}", seed), None).unwrap().public() +fn insecure_pair_from_name(name: &'static str) -> Pair { + Pair::from_string(&format!("//{}", name), None).unwrap() } -fn get_account_id_from_seed(seed: &'static str) -> AccountId -where - AccountPublic: From<::Public>, -{ - AccountPublic::from(get_from_seed::(seed)).into_account() +fn account_id_from_name(name: &'static str) -> AccountId { + insecure_pair_from_name(name).public() } fn testnet_genesis(wasm_binary: &[u8], endowed_accounts: Vec) -> GenesisConfig { @@ -44,18 +38,18 @@ pub fn development_config() -> Result { testnet_genesis( wasm_binary, vec![ - get_account_id_from_seed::("Alice"), - get_account_id_from_seed::("Bob"), - get_account_id_from_seed::("Charlie"), - get_account_id_from_seed::("Dave"), - get_account_id_from_seed::("Eve"), - get_account_id_from_seed::("Ferdie"), - get_account_id_from_seed::("Alice//stash"), - get_account_id_from_seed::("Bob//stash"), - get_account_id_from_seed::("Charlie//stash"), - get_account_id_from_seed::("Dave//stash"), - get_account_id_from_seed::("Eve//stash"), - get_account_id_from_seed::("Ferdie//stash"), + account_id_from_name("Alice"), + account_id_from_name("Bob"), + account_id_from_name("Charlie"), + account_id_from_name("Dave"), + account_id_from_name("Eve"), + account_id_from_name("Ferdie"), + account_id_from_name("Alice//stash"), + account_id_from_name("Bob//stash"), + account_id_from_name("Charlie//stash"), + account_id_from_name("Dave//stash"), + account_id_from_name("Eve//stash"), + account_id_from_name("Ferdie//stash"), ], ) },