mocks + runtimes: fix stakers, remove controller accounts

substrate/frame/babe/src/mock.rs

@@ -347,9 +347,8 @@ pub fn new_test_ext_raw_authorities(authorities: Vec<AuthorityId>) -> sp_io::Tes
 		.assimilate_storage(&mut t)
 		.unwrap();
 
-	// controllers are same as stash
 	let stakers: Vec<_> = (0..authorities.len())
-		.map(|i| (i as u64, i as u64, 10_000, pallet_staking::StakerStatus::<u64>::Validator))
+		.map(|i| (i as u64, 10_000, pallet_staking::StakerStatus::<u64>::Validator))
 		.collect();
 
 	let staking_config = pallet_staking::GenesisConfig::<Test> {

substrate/frame/beefy/src/mock.rs

@@ -247,9 +247,8 @@ impl ExtBuilder {
 			.assimilate_storage(&mut t)
 			.unwrap();
 
-		// controllers are same as stash
 		let stakers: Vec<_> = (0..self.authorities.len())
-			.map(|i| (i as u64, i as u64, 10_000, pallet_staking::StakerStatus::<u64>::Validator))
+			.map(|i| (i as u64, 10_000, pallet_staking::StakerStatus::<u64>::Validator))
 			.collect();
 
 		let staking_config = pallet_staking::GenesisConfig::<Test> {

substrate/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs

@@ -492,19 +492,6 @@ impl Default for BalancesExtBuilder {
 			(2, 20),
 			(3, 300),
 			(4, 400),
-			// controllers (still used in some tests. Soon to be deprecated).
-			// TODO: Ensure these are not being used in tests & remove.
-			(10, 100),
-			(20, 100),
-			(30, 100),
-			(40, 100),
-			(50, 100),
-			(60, 100),
-			(70, 100),
-			(80, 100),
-			(90, 100),
-			(100, 100),
-			(200, 100),
 			// stashes
 			(11, 1000),
 			(21, 2000),

substrate/frame/fast-unstake/src/mock.rs

@@ -204,19 +204,13 @@ pub(crate) fn fast_unstake_events_since_last_call() -> Vec<super::Event<Runtime>
 }
 
 pub struct ExtBuilder {
-	unexposed: Vec<(AccountId, AccountId, Balance)>,
+	unexposed: Vec<(AccountId, Balance)>,
 }
 
 impl Default for ExtBuilder {
 	fn default() -> Self {
 		Self {
-			unexposed: vec![
-				(1, 1, 7 + 100),
-				(3, 3, 7 + 100),
-				(5, 5, 7 + 100),
-				(7, 7, 7 + 100),
-				(9, 9, 7 + 100),
-			],
+			unexposed: vec![(1, 7 + 100), (3, 7 + 100), (5, 7 + 100), (7, 7 + 100), (9, 7 + 100)],
 		}
 	}
 }
@@ -266,7 +260,7 @@ impl ExtBuilder {
 				.unexposed
 				.clone()
 				.into_iter()
-				.map(|(stash, _, balance)| (stash, balance * 2))
+				.map(|(stash, balance)| (stash, balance * 2))
 				.chain(validators_range.clone().map(|x| (x, 7 + 100)))
 				.chain(nominators_range.clone().map(|x| (x, 7 + 100)))
 				.collect::<Vec<_>>(),
@@ -277,9 +271,11 @@ impl ExtBuilder {
 			stakers: self
 				.unexposed
 				.into_iter()
-				.map(|(x, y, z)| (x, y, z, pallet_staking::StakerStatus::Nominator(vec![42])))
-				.chain(validators_range.map(|x| (x, x, 100, StakerStatus::Validator)))
-				.chain(nominators_range.map(|x| (x, x, 100, StakerStatus::Nominator(vec![x]))))
+				.map(|(stash, balance)| {
+					(stash, balance, pallet_staking::StakerStatus::Nominator(vec![42]))
+				})
+				.chain(validators_range.map(|x| (x, 100, StakerStatus::Validator)))
+				.chain(nominators_range.map(|x| (x, 100, StakerStatus::Nominator(vec![x]))))
 				.collect::<Vec<_>>(),
 			..Default::default()
 		}

substrate/frame/grandpa/src/mock.rs

@@ -260,9 +260,8 @@ pub fn new_test_ext_raw_authorities(authorities: AuthorityList) -> sp_io::TestEx
 		.assimilate_storage(&mut t)
 		.unwrap();
 
-	// controllers are the same as stash
 	let stakers: Vec<_> = (0..authorities.len())
-		.map(|i| (i as u64, i as u64, 10_000, pallet_staking::StakerStatus::<u64>::Validator))
+		.map(|i| (i as u64, 10_000, pallet_staking::StakerStatus::<u64>::Validator))
 		.collect();
 
 	let staking_config = pallet_staking::GenesisConfig::<Test> {

substrate/frame/root-offences/src/mock.rs

@@ -223,11 +223,6 @@ impl ExtBuilder {
 
 		pallet_balances::GenesisConfig::<Test> {
 			balances: vec![
-				// controllers (still used in some tests. Soon to be deprecated).
-				(10, self.balance_factor * 50),
-				(20, self.balance_factor * 50),
-				(30, self.balance_factor * 50),
-				(40, self.balance_factor * 50),
 				// stashes
 				(11, self.balance_factor * 1000),
 				(21, self.balance_factor * 1000),

substrate/frame/staking/src/mock.rs

@@ -448,12 +448,6 @@ impl ExtBuilder {
 				(2, 20 * self.balance_factor),
 				(3, 300 * self.balance_factor),
 				(4, 400 * self.balance_factor),
-				// controllers (still used in some tests. Soon to be deprecated).
-				(10, self.balance_factor),
-				(20, self.balance_factor),
-				(30, self.balance_factor),
-				(40, self.balance_factor),
-				(50, self.balance_factor),
 				// stashes
 				(11, self.balance_factor * 1000),
 				(21, self.balance_factor * 2000),
@@ -466,6 +460,9 @@ impl ExtBuilder {
 				(100, self.balance_factor * 2000),
 				(101, self.balance_factor * 2000),
 				// aux accounts
+				(10, self.balance_factor),
+				(30, self.balance_factor),
+				(50, self.balance_factor),
 				(60, self.balance_factor),
 				(61, self.balance_factor * 2000),
 				(70, self.balance_factor),

substrate/frame/staking/src/tests.rs

@@ -229,10 +229,6 @@ fn basic_setup_works() {
 		// Initial Era and session
 		assert_eq!(active_era(), 0);
 
-		// Account 10 has `balance_factor` free balance
-		assert_eq!(Balances::free_balance(10), 1);
-		assert_eq!(Balances::free_balance(10), 1);
-
 		// New era is not being forced
 		assert_eq!(Staking::force_era(), Forcing::NotForcing);
 	});
@@ -972,8 +968,6 @@ fn reward_destination_works() {
 	ExtBuilder::default().nominate(false).build_and_execute(|| {
 		// Check that account 11 is a validator
 		assert!(Session::validators().contains(&11));
-		// Check the balance of the validator account
-		assert_eq!(Balances::free_balance(10), 1);
 		// Check the balance of the stash account
 		assert_eq!(Balances::free_balance(11), 1000);
 		// Check how much is at stake
@@ -7256,17 +7250,17 @@ mod ledger {
 	fn paired_account_works() {
 		ExtBuilder::default().try_state(false).build_and_execute(|| {
 			assert_ok!(Staking::bond(
-				RuntimeOrigin::signed(10),
+				RuntimeOrigin::signed(61),
 				100,
-				RewardDestination::Account(10)
+				RewardDestination::Account(61)
 			));
 
-			assert_eq!(<Bonded<Test>>::get(&10), Some(10));
+			assert_eq!(<Bonded<Test>>::get(&61), Some(61));
 			assert_eq!(
-				StakingLedger::<Test>::paired_account(StakingAccount::Controller(10)),
-				Some(10)
+				StakingLedger::<Test>::paired_account(StakingAccount::Controller(61)),
+				Some(61)
 			);
-			assert_eq!(StakingLedger::<Test>::paired_account(StakingAccount::Stash(10)), Some(10));
+			assert_eq!(StakingLedger::<Test>::paired_account(StakingAccount::Stash(61)), Some(61));
 
 			assert_eq!(<Bonded<Test>>::get(&42), None);
 			assert_eq!(StakingLedger::<Test>::paired_account(StakingAccount::Controller(42)), None);