Add era to Unbonded event

frame/nomination-pools/src/lib.rs

@@ -1349,6 +1349,7 @@ pub mod pallet {
 		///   pool.
 		/// - `points` is the number of points that are issued as a result of `balance` being
 		/// dissolved into the corresponding unbonding pool.
+		/// - `era` is the era that the Unbond Event took place.
 		///
 		/// In the absence of slashing, these values will match. In the presence of slashing, the
 		/// number of points that are issued in the unbonding pool will be less than the amount
@@ -1358,6 +1359,7 @@ pub mod pallet {
 			pool_id: PoolId,
 			balance: BalanceOf<T>,
 			points: BalanceOf<T>,
+			era: u32,
 		},
 		/// A member has withdrawn from their pool.
 		///
@@ -1683,6 +1685,7 @@ pub mod pallet {
 				pool_id: member.pool_id,
 				points: points_unbonded,
 				balance: unbonding_balance,
+				era: unbond_era,
 			});
 
 			// Now that we know everything has worked write the items to storage.

frame/nomination-pools/src/migration.rs

@@ -346,8 +346,6 @@ pub mod v2 {
 
 		#[cfg(feature = "try-runtime")]
 		fn pre_upgrade() -> Result<(), &'static str> {
-			// all reward accounts must have more than ED.
-			RewardPools::<T>::iter().for_each(|(id, _)| {
 				assert!(
 					T::Currency::free_balance(&Pallet::<T>::create_reward_account(id)) >=
 						T::Currency::minimum_balance()
@@ -360,7 +358,6 @@ pub mod v2 {
 		#[cfg(feature = "try-runtime")]
 		fn post_upgrade() -> Result<(), &'static str> {
 			// new version must be set.
-			assert_eq!(Pallet::<T>::on_chain_storage_version(), 2);
 
 			// no reward or bonded pool has been skipped.
 			assert_eq!(RewardPools::<T>::iter().count() as u32, RewardPools::<T>::count());