remove duplicate accounts in chain-spec. (#7725)

* remove duplicate accounts in chain-spec.

* Fix build

* Enforce in balances modules.

* Apply suggestions from code review

* Update frame/balances/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Bastian Köcher <git@kchr.de>
This commit is contained in:
Kian Paimani
2020-12-15 10:30:44 +00:00
committed by GitHub
parent 5a19ece7e3
commit 9706023ec7
3 changed files with 25 additions and 5 deletions
+10 -5
View File
@@ -218,7 +218,7 @@ pub fn testnet_genesis(
endowed_accounts: Option<Vec<AccountId>>,
enable_println: bool,
) -> GenesisConfig {
let endowed_accounts: Vec<AccountId> = endowed_accounts.unwrap_or_else(|| {
let mut endowed_accounts: Vec<AccountId> = endowed_accounts.unwrap_or_else(|| {
vec![
get_account_id_from_seed::<sr25519::Public>("Alice"),
get_account_id_from_seed::<sr25519::Public>("Bob"),
@@ -234,10 +234,16 @@ pub fn testnet_genesis(
get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
]
});
initial_authorities.iter().for_each(|x|
if !endowed_accounts.contains(&x.0) {
endowed_accounts.push(x.0.clone())
}
);
let num_endowed_accounts = endowed_accounts.len();
const ENDOWMENT: Balance = 10_000_000 * DOLLARS;
const STASH: Balance = 100 * DOLLARS;
const STASH: Balance = ENDOWMENT / 1000;
GenesisConfig {
frame_system: Some(SystemConfig {
@@ -246,9 +252,8 @@ pub fn testnet_genesis(
}),
pallet_balances: Some(BalancesConfig {
balances: endowed_accounts.iter().cloned()
.map(|k| (k, ENDOWMENT))
.chain(initial_authorities.iter().map(|x| (x.0.clone(), STASH)))
.collect(),
.map(|x| (x, ENDOWMENT))
.collect()
}),
pallet_indices: Some(IndicesConfig {
indices: vec![],