Unverified Commit 400ecc58 authored by Gavin Wood's avatar Gavin Wood Committed by GitHub
Browse files

Companion for #7363 (Account-providers ref-counting) (#2152)



* Fix

* Fix

* Bump Substrate
Co-authored-by: Shawn Tabrizi's avatarShawn Tabrizi <shawntabrizi@gmail.com>
parent 5649a8a1
Pipeline #120544 passed with stages
in 30 minutes and 46 seconds
This diff is collapsed.
...@@ -651,7 +651,7 @@ mod tests { ...@@ -651,7 +651,7 @@ mod tests {
type PalletInfo = (); type PalletInfo = ();
type AccountData = pallet_balances::AccountData<u64>; type AccountData = pallet_balances::AccountData<u64>;
type OnNewAccount = (); type OnNewAccount = ();
type OnKilledAccount = Balances; type OnKilledAccount = ();
type SystemWeightInfo = (); type SystemWeightInfo = ();
type SS58Prefix = (); type SS58Prefix = ();
} }
......
...@@ -644,7 +644,7 @@ mod tests { ...@@ -644,7 +644,7 @@ mod tests {
type PalletInfo = (); type PalletInfo = ();
type AccountData = pallet_balances::AccountData<u64>; type AccountData = pallet_balances::AccountData<u64>;
type OnNewAccount = (); type OnNewAccount = ();
type OnKilledAccount = Balances; type OnKilledAccount = ();
type SystemWeightInfo = (); type SystemWeightInfo = ();
type SS58Prefix = (); type SS58Prefix = ();
} }
......
...@@ -329,7 +329,7 @@ mod tests { ...@@ -329,7 +329,7 @@ mod tests {
type PalletInfo = (); type PalletInfo = ();
type AccountData = pallet_balances::AccountData<u128>; type AccountData = pallet_balances::AccountData<u128>;
type OnNewAccount = (); type OnNewAccount = ();
type OnKilledAccount = Balances; type OnKilledAccount = ();
type SystemWeightInfo = (); type SystemWeightInfo = ();
type SS58Prefix = (); type SS58Prefix = ();
} }
...@@ -563,21 +563,21 @@ mod tests { ...@@ -563,21 +563,21 @@ mod tests {
Sr25519Keyring::Two, Sr25519Keyring::Two,
]; ];
let balances: Vec<_> = (0..authority_keys.len()).map(|i| (i as u64, 10_000_000)).collect();
pallet_balances::GenesisConfig::<Test> {
balances,
}.assimilate_storage(&mut t).unwrap();
// stashes are the index. // stashes are the index.
let session_keys: Vec<_> = authority_keys.iter().enumerate() let session_keys: Vec<_> = authority_keys.iter().enumerate()
.map(|(i, _k)| (i as u64, i as u64, UintAuthorityId(i as u64))) .map(|(i, _k)| (i as u64, i as u64, UintAuthorityId(i as u64)))
.collect(); .collect();
let balances: Vec<_> = (0..authority_keys.len()).map(|i| (i as u64, 10_000_000)).collect();
pallet_session::GenesisConfig::<Test> { pallet_session::GenesisConfig::<Test> {
keys: session_keys, keys: session_keys,
}.assimilate_storage(&mut t).unwrap(); }.assimilate_storage(&mut t).unwrap();
pallet_balances::GenesisConfig::<Test> {
balances,
}.assimilate_storage(&mut t).unwrap();
t.into() t.into()
} }
......
...@@ -445,7 +445,7 @@ mod tests { ...@@ -445,7 +445,7 @@ mod tests {
type PalletInfo = (); type PalletInfo = ();
type AccountData = pallet_balances::AccountData<u64>; type AccountData = pallet_balances::AccountData<u64>;
type OnNewAccount = (); type OnNewAccount = ();
type OnKilledAccount = Balances; type OnKilledAccount = ();
type SystemWeightInfo = (); type SystemWeightInfo = ();
type SS58Prefix = (); type SS58Prefix = ();
} }
......
...@@ -982,7 +982,7 @@ mod tests { ...@@ -982,7 +982,7 @@ mod tests {
type PalletInfo = (); type PalletInfo = ();
type AccountData = pallet_balances::AccountData<u64>; type AccountData = pallet_balances::AccountData<u64>;
type OnNewAccount = (); type OnNewAccount = ();
type OnKilledAccount = Balances; type OnKilledAccount = ();
type SystemWeightInfo = (); type SystemWeightInfo = ();
type SS58Prefix = (); type SS58Prefix = ();
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment