Skip to content
Snippets Groups Projects
Unverified Commit 9b94d8fb authored by bgallois's avatar bgallois
Browse files

fix initial TotalIssuance

parent 25b5277e
No related branches found
No related tags found
No related merge requests found
...@@ -416,7 +416,7 @@ fn gen_genesis_for_local_chain( ...@@ -416,7 +416,7 @@ fn gen_genesis_for_local_chain(
.map(|(i, keys)| (i as u32 + 1, (keys.0.clone(), i < initial_authorities_len))) .map(|(i, keys)| (i as u32 + 1, (keys.0.clone(), i < initial_authorities_len)))
.collect(), .collect(),
}, },
// Necessary to initialize TotalIssuence // Necessary to initialize TotalIssuance
balances: BalancesConfig { balances: BalancesConfig {
balances: initial_identities balances: initial_identities
.iter() .iter()
......
...@@ -170,7 +170,17 @@ impl ExtBuilder { ...@@ -170,7 +170,17 @@ impl ExtBuilder {
.unwrap();*/ .unwrap();*/
pallet_duniter_account::GenesisConfig::<Runtime> { pallet_duniter_account::GenesisConfig::<Runtime> {
accounts: initial_accounts, accounts: initial_accounts.clone(),
}
.assimilate_storage(&mut t)
.unwrap();
// Necessary to initialize TotalIssuance
pallet_balances::GenesisConfig::<Runtime> {
balances: initial_accounts
.iter()
.map(|(key, balance)| (key.clone(), balance.balance.clone()))
.collect(),
} }
.assimilate_storage(&mut t) .assimilate_storage(&mut t)
.unwrap(); .unwrap();
...@@ -268,7 +278,10 @@ impl ExtBuilder { ...@@ -268,7 +278,10 @@ impl ExtBuilder {
pallet_universal_dividend::GenesisConfig::<Runtime> { pallet_universal_dividend::GenesisConfig::<Runtime> {
first_reeval: 100, first_reeval: 100,
first_ud: 1_000, first_ud: 1_000,
initial_monetary_mass: 0, initial_monetary_mass: initial_accounts
.iter()
.map(|(_, balance)| balance.balance.clone())
.sum(),
} }
.assimilate_storage(&mut t) .assimilate_storage(&mut t)
.unwrap(); .unwrap();
......
...@@ -257,7 +257,7 @@ fn test_ud_claimed_membership_on_and_off() { ...@@ -257,7 +257,7 @@ fn test_ud_claimed_membership_on_and_off() {
pallet_universal_dividend::Event::NewUdCreated { pallet_universal_dividend::Event::NewUdCreated {
amount: 1000, amount: 1000,
index: 1, index: 1,
monetary_mass: 4000, monetary_mass: 4_000 + 4_000, // Initial + produced
members_count: 4, members_count: 4,
}, },
)); ));
...@@ -289,8 +289,8 @@ fn test_ud_claimed_membership_on_and_off() { ...@@ -289,8 +289,8 @@ fn test_ud_claimed_membership_on_and_off() {
pallet_universal_dividend::Event::NewUdCreated { pallet_universal_dividend::Event::NewUdCreated {
amount: 1000, amount: 1000,
index: 2, index: 2,
monetary_mass: 7000, // 4000 + 3 × 1000 monetary_mass: 11_000, // 4000 + 4000 + 3 × 1000
members_count: 3, // alice is not member at this UD members_count: 3, // alice is not member at this UD
}, },
)); ));
...@@ -308,7 +308,7 @@ fn test_ud_claimed_membership_on_and_off() { ...@@ -308,7 +308,7 @@ fn test_ud_claimed_membership_on_and_off() {
pallet_universal_dividend::Event::NewUdCreated { pallet_universal_dividend::Event::NewUdCreated {
amount: 1000, amount: 1000,
index: 3, index: 3,
monetary_mass: 11000, // 7000 + 4 × 1000 monetary_mass: 15000, // 11000 + 4 × 1000
members_count: 4, // alice is member again at this UD members_count: 4, // alice is member again at this UD
}, },
)); ));
......
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