Staking-Async + EPMB: Migrate operations to poll

cumulus/parachains/runtimes/assets/asset-hub-westend/src/staking.rs

@@ -133,6 +133,7 @@ impl multi_block::Config for Runtime {
 	// Revert back to signed phase if nothing is submitted and queued, so we prolong the election.
 	type AreWeDone = multi_block::RevertToSignedIfNotQueuedOf<Self>;
 	type OnRoundRotation = multi_block::CleanRound<Self>;
+	type Signed = MultiBlockElectionSigned;
 	type WeightInfo = multi_block::weights::westend::MultiBlockWeightInfo<Self>;
 }
 

substrate/frame/election-provider-multi-block/src/benchmarking.rs

@@ -35,20 +35,20 @@ mod benchmarks {
 	use super::*;
 
 	#[benchmark(pov_mode = Measured)]
-	fn on_initialize_nothing() -> Result<(), BenchmarkError> {
+	fn per_block_nothing() -> Result<(), BenchmarkError> {
 		assert_eq!(CurrentPhase::<T>::get(), Phase::Off);
 
 		#[block]
 		{
-			Pallet::<T>::roll_next(true, false);
+			Pallet::<T>::roll_next(false);
 		}
 
 		assert_eq!(CurrentPhase::<T>::get(), Phase::Off);
 		Ok(())
 	}
 
 	#[benchmark(pov_mode = Measured)]
-	fn on_initialize_into_snapshot_msp() -> Result<(), BenchmarkError> {
+	fn per_block_snapshot_msp() -> Result<(), BenchmarkError> {
 		assert!(T::Pages::get() >= 2, "this benchmark only works in a runtime with 2 pages or more, set at least `type Pages = 2` for benchmark run");
 
 		#[cfg(test)]
@@ -59,7 +59,7 @@ mod benchmarks {
 
 		#[block]
 		{
-			Pallet::<T>::roll_next(true, false);
+			Pallet::<T>::roll_next(false);
 		}
 
 		// we have collected the target snapshot only
@@ -76,7 +76,7 @@ mod benchmarks {
 	}
 
 	#[benchmark(pov_mode = Measured)]
-	fn on_initialize_into_snapshot_rest() -> Result<(), BenchmarkError> {
+	fn per_block_snapshot_rest() -> Result<(), BenchmarkError> {
 		assert!(T::Pages::get() >= 2, "this benchmark only works in a runtime with 2 pages or more, set at least `type Pages = 2` for benchmark run");
 
 		#[cfg(test)]
@@ -99,7 +99,7 @@ mod benchmarks {
 		// take one more snapshot page.
 		#[block]
 		{
-			Pallet::<T>::roll_next(true, false);
+			Pallet::<T>::roll_next(false);
 		}
 
 		// we have now collected the first page of voters.
@@ -115,29 +115,7 @@ mod benchmarks {
 	}
 
 	#[benchmark(pov_mode = Measured)]
-	fn on_initialize_into_signed() -> Result<(), BenchmarkError> {
-		#[cfg(test)]
-		crate::mock::ElectionStart::set(sp_runtime::traits::Bounded::max_value());
-		crate::Pallet::<T>::start().unwrap();
-
-		Pallet::<T>::roll_until_before_matches(|| {
-			matches!(CurrentPhase::<T>::get(), Phase::Signed(_))
-		});
-
-		assert_eq!(CurrentPhase::<T>::get(), Phase::Snapshot(0));
-
-		#[block]
-		{
-			Pallet::<T>::roll_next(true, false);
-		}
-
-		assert!(CurrentPhase::<T>::get().is_signed());
-
-		Ok(())
-	}
-
-	#[benchmark(pov_mode = Measured)]
-	fn on_initialize_into_signed_validation() -> Result<(), BenchmarkError> {
+	fn per_block_start_signed_validation() -> Result<(), BenchmarkError> {
 		#[cfg(test)]
 		crate::mock::ElectionStart::set(sp_runtime::traits::Bounded::max_value());
 		crate::Pallet::<T>::start().unwrap();
@@ -150,29 +128,11 @@ mod benchmarks {
 
 		#[block]
 		{
-			Pallet::<T>::roll_next(true, false);
+			Pallet::<T>::roll_next(false);
 		}
 
-		Ok(())
-	}
-
-	#[benchmark(pov_mode = Measured)]
-	fn on_initialize_into_unsigned() -> Result<(), BenchmarkError> {
-		#[cfg(test)]
-		crate::mock::ElectionStart::set(sp_runtime::traits::Bounded::max_value());
-		crate::Pallet::<T>::start().unwrap();
-
-		Pallet::<T>::roll_until_before_matches(|| {
-			matches!(CurrentPhase::<T>::get(), Phase::Unsigned(_))
-		});
-		assert!(matches!(CurrentPhase::<T>::get(), Phase::SignedValidation(_)));
-
-		#[block]
-		{
-			Pallet::<T>::roll_next(true, false);
-		}
+		assert!(CurrentPhase::<T>::get().is_signed_validation());
 
-		assert!(matches!(CurrentPhase::<T>::get(), Phase::Unsigned(_)));
 		Ok(())
 	}