Skip to content
Snippets Groups Projects
Unverified Commit 55f4ff75 authored by Greg Hill's avatar Greg Hill Committed by GitHub
Browse files

harmonize tokens genesis config with pallet_balances (#512)

parent e99fa834
No related branches found
No related tags found
No related merge requests found
...@@ -167,7 +167,7 @@ impl ExtBuilder { ...@@ -167,7 +167,7 @@ impl ExtBuilder {
.unwrap(); .unwrap();
orml_tokens::GenesisConfig::<Runtime> { orml_tokens::GenesisConfig::<Runtime> {
endowed_accounts: self balances: self
.endowed_accounts .endowed_accounts
.into_iter() .into_iter()
.filter(|(_, currency_id, _)| *currency_id != NATIVE_CURRENCY_ID) .filter(|(_, currency_id, _)| *currency_id != NATIVE_CURRENCY_ID)
......
...@@ -262,15 +262,13 @@ pub mod module { ...@@ -262,15 +262,13 @@ pub mod module {
#[pallet::genesis_config] #[pallet::genesis_config]
pub struct GenesisConfig<T: Config> { pub struct GenesisConfig<T: Config> {
pub endowed_accounts: Vec<(T::AccountId, T::CurrencyId, T::Balance)>, pub balances: Vec<(T::AccountId, T::CurrencyId, T::Balance)>,
} }
#[cfg(feature = "std")] #[cfg(feature = "std")]
impl<T: Config> Default for GenesisConfig<T> { impl<T: Config> Default for GenesisConfig<T> {
fn default() -> Self { fn default() -> Self {
GenesisConfig { GenesisConfig { balances: vec![] }
endowed_accounts: vec![],
}
} }
} }
...@@ -279,16 +277,16 @@ pub mod module { ...@@ -279,16 +277,16 @@ pub mod module {
fn build(&self) { fn build(&self) {
// ensure no duplicates exist. // ensure no duplicates exist.
let unique_endowed_accounts = self let unique_endowed_accounts = self
.endowed_accounts .balances
.iter() .iter()
.map(|(account_id, currency_id, _)| (account_id, currency_id)) .map(|(account_id, currency_id, _)| (account_id, currency_id))
.collect::<std::collections::BTreeSet<_>>(); .collect::<std::collections::BTreeSet<_>>();
assert!( assert!(
unique_endowed_accounts.len() == self.endowed_accounts.len(), unique_endowed_accounts.len() == self.balances.len(),
"duplicate endowed accounts in genesis." "duplicate endowed accounts in genesis."
); );
self.endowed_accounts self.balances
.iter() .iter()
.for_each(|(account_id, currency_id, initial_balance)| { .for_each(|(account_id, currency_id, initial_balance)| {
assert!( assert!(
......
...@@ -274,7 +274,7 @@ impl ExtBuilder { ...@@ -274,7 +274,7 @@ impl ExtBuilder {
.unwrap(); .unwrap();
tokens::GenesisConfig::<Runtime> { tokens::GenesisConfig::<Runtime> {
endowed_accounts: self.endowed_accounts, balances: self.endowed_accounts,
} }
.assimilate_storage(&mut t) .assimilate_storage(&mut t)
.unwrap(); .unwrap();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment