From 55f4ff75b3836d32f651e0c9ad230b647b34965e Mon Sep 17 00:00:00 2001
From: Greg Hill <gregorydhill@outlook.com>
Date: Sat, 12 Jun 2021 06:11:35 +0100
Subject: [PATCH] harmonize tokens genesis config with pallet_balances (#512)
Signed-off-by: Gregory Hill <gregorydhill@outlook.com>
---
currencies/src/mock.rs | 2 +-
tokens/src/lib.rs | 12 +++++-------
tokens/src/mock.rs | 2 +-
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/currencies/src/mock.rs b/currencies/src/mock.rs
index cefdb68..c4edf07 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 ad5ae6b..4b1f3bf 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 861e4c3..6676927 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();
--
GitLab