diff --git a/currencies/src/mock.rs b/currencies/src/mock.rs index cefdb68551b6a6bc87d6418a07632f416537a6c1..c4edf0788d170a49424f51ce6b8c00b784e360e9 100644 --- a/currencies/src/mock.rs +++ b/currencies/src/mock.rs @@ -167,7 +167,7 @@ impl ExtBuilder { .unwrap(); orml_tokens::GenesisConfig::<Runtime> { - endowed_accounts: self + balances: self .endowed_accounts .into_iter() .filter(|(_, currency_id, _)| *currency_id != NATIVE_CURRENCY_ID) diff --git a/tokens/src/lib.rs b/tokens/src/lib.rs index ad5ae6b2bc0004c45d59a09232dbfbade647351a..4b1f3bfc7ea4d54e0abb907053940a3513334d43 100644 --- a/tokens/src/lib.rs +++ b/tokens/src/lib.rs @@ -262,15 +262,13 @@ pub mod module { #[pallet::genesis_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")] impl<T: Config> Default for GenesisConfig<T> { fn default() -> Self { - GenesisConfig { - endowed_accounts: vec![], - } + GenesisConfig { balances: vec![] } } } @@ -279,16 +277,16 @@ pub mod module { fn build(&self) { // ensure no duplicates exist. let unique_endowed_accounts = self - .endowed_accounts + .balances .iter() .map(|(account_id, currency_id, _)| (account_id, currency_id)) .collect::<std::collections::BTreeSet<_>>(); assert!( - unique_endowed_accounts.len() == self.endowed_accounts.len(), + unique_endowed_accounts.len() == self.balances.len(), "duplicate endowed accounts in genesis." ); - self.endowed_accounts + self.balances .iter() .for_each(|(account_id, currency_id, initial_balance)| { assert!( diff --git a/tokens/src/mock.rs b/tokens/src/mock.rs index 861e4c3976148ae1779e4ce2dcbf5bb31d17e133..667692724cc8b4bf87eb3bf282ffa3dbc102ed3e 100644 --- a/tokens/src/mock.rs +++ b/tokens/src/mock.rs @@ -274,7 +274,7 @@ impl ExtBuilder { .unwrap(); tokens::GenesisConfig::<Runtime> { - endowed_accounts: self.endowed_accounts, + balances: self.endowed_accounts, } .assimilate_storage(&mut t) .unwrap();