undo pool changes

polkadot/runtime/westend/src/lib.rs

@@ -1007,7 +1007,8 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
 				matches!(
 					c,
 					RuntimeCall::Staking(..) |
-						RuntimeCall::Session(..) | RuntimeCall::Utility(..) |
+						RuntimeCall::Session(..) |
+						RuntimeCall::Utility(..) |
 						RuntimeCall::FastUnstake(..) |
 						RuntimeCall::VoterList(..) |
 						RuntimeCall::NominationPools(..)
@@ -2698,6 +2699,11 @@ mod remote_tests {
 			.await
 			.unwrap();
 		ext.execute_with(|| {
+			// create an account with some balance
+			let alice = AccountId::from([1u8; 32]);
+			use frame_support::traits::Currency;
+			Balances::deposit_creating(&alice, 100_000 * UNITS);
+
 			let mut needs_migration = 0;
 			let mut success = 0;
 
@@ -2707,14 +2713,18 @@ mod remote_tests {
 					k.clone(),
 				) {
 					needs_migration = needs_migration + 1;
-					pallet_nomination_pools::Pallet::<Runtime>::migrate_to_delegate_stake(k)
-						.map(|_| success = success + 1)
-						.map_err(|e| log::error!("Failed to migrate pool {}: {:?}", k, e));
+					pallet_nomination_pools::Pallet::<Runtime>::migrate_pool_to_delegate_stake(
+						RuntimeOrigin::signed(alice.clone()).into(),
+						k,
+					)
+					.map(|_| success = success + 1)
+					.map_err(|e| log::error!(target: "remote_test", "Failed to migrate pool {}: {:?}", k, e));
 				}
 			});
 
 			// log summary
 			log::info!(
+				target: "remote_test",
 				"Migration summary: {} pools needed migration, {} pools successfully migrated",
 				needs_migration,
 				success
@@ -2729,16 +2739,18 @@ mod remote_tests {
 					k.clone(),
 				) {
 					needs_migration = needs_migration + 1;
-					pallet_nomination_pools::Pallet::<Runtime>::migrate_member_to_delegate_stake(
-						k.clone(),
+					pallet_nomination_pools::Pallet::<Runtime>::migrate_delegation(
+						RuntimeOrigin::signed(alice.clone()).into(),
+						sp_runtime::MultiAddress::Id(k.clone()),
 					)
 					.map(|_| success = success + 1)
-					.map_err(|e| log::error!("Failed to migrate member {}: {:?}", k, e));
+					.map_err(|e| log::error!(target: "remote_test", "Failed to migrate member {}: {:?}", k, e));
 				}
 			});
 
 			// log summary
 			log::info!(
+				target: "remote_test",
 				"Migration summary: {} members needed migration, {} members successfully migrated",
 				needs_migration,
 				success

substrate/frame/nomination-pools/src/lib.rs

@@ -2916,7 +2916,32 @@ pub mod pallet {
 			);
 
 			let member_account = T::Lookup::lookup(member_account)?;
-			Self::migrate_member_to_delegate_stake(member_account)?;
+			let member =
+				PoolMembers::<T>::get(&member_account).ok_or(Error::<T>::PoolMemberNotFound)?;
+
+			// ensure pool is migrated.
+			ensure!(
+				T::StakeAdapter::pool_strategy(Pool::from(Self::generate_bonded_account(
+					member.pool_id
+				))) == adapter::StakeStrategyType::Delegate,
+				Error::<T>::NotMigrated
+			);
+
+			let pool_contribution = member.total_balance();
+			ensure!(pool_contribution >= MinJoinBond::<T>::get(), Error::<T>::MinimumBondNotMet);
+			// the member must have some contribution to be migrated.
+			ensure!(pool_contribution > Zero::zero(), Error::<T>::AlreadyMigrated);
+
+			let delegation =
+				T::StakeAdapter::member_delegation_balance(Member::from(member_account.clone()));
+			// delegation should not exist.
+			ensure!(delegation.is_none(), Error::<T>::AlreadyMigrated);
+
+			T::StakeAdapter::migrate_delegation(
+				Pool::from(Pallet::<T>::generate_bonded_account(member.pool_id)),
+				Member::from(member_account),
+				pool_contribution,
+			)?;
 
 			// if successful, we refund the fee.
 			Ok(Pays::No.into())
@@ -3069,42 +3094,13 @@ impl<T: Config> Pallet<T> {
 		T::PalletId::get().into_sub_account_truncating((AccountType::Bonded, id))
 	}
 
-	pub fn migrate_to_delegate_stake(id: PoolId) -> DispatchResult {
+	fn migrate_to_delegate_stake(id: PoolId) -> DispatchResult {
 		T::StakeAdapter::migrate_nominator_to_agent(
 			Pool::from(Self::generate_bonded_account(id)),
 			&Self::generate_reward_account(id),
 		)
 	}
 
-	pub fn migrate_member_to_delegate_stake(member_account: T::AccountId) -> DispatchResult {
-		let member =
-			PoolMembers::<T>::get(&member_account).ok_or(Error::<T>::PoolMemberNotFound)?;
-
-		// ensure pool is migrated.
-		ensure!(
-			T::StakeAdapter::pool_strategy(Pool::from(Self::generate_bonded_account(
-				member.pool_id
-			))) == adapter::StakeStrategyType::Delegate,
-			Error::<T>::NotMigrated
-		);
-
-		let pool_contribution = member.total_balance();
-		ensure!(pool_contribution >= MinJoinBond::<T>::get(), Error::<T>::MinimumBondNotMet);
-		// the member must have some contribution to be migrated.
-		ensure!(pool_contribution > Zero::zero(), Error::<T>::AlreadyMigrated);
-
-		let delegation =
-			T::StakeAdapter::member_delegation_balance(Member::from(member_account.clone()));
-		// delegation should not exist.
-		ensure!(delegation.is_none(), Error::<T>::AlreadyMigrated);
-
-		T::StakeAdapter::migrate_delegation(
-			Pool::from(Pallet::<T>::generate_bonded_account(member.pool_id)),
-			Member::from(member_account),
-			pool_contribution,
-		)
-	}
-
 	/// Create the reward account of a pool with the given id.
 	pub fn generate_reward_account(id: PoolId) -> T::AccountId {
 		// NOTE: in order to have a distinction in the test account id type (u128), we put