Additional checks to delayed solution eras and mock fixes

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

@@ -18,7 +18,7 @@
 #![cfg(test)]
 mod mock;
 
-pub(crate) const LOG_TARGET: &str = "tests::epm";
+pub(crate) const LOG_TARGET: &str = "tests::e2e-epm";
 
 use mock::*;
 use sp_npos_elections::{to_supports, StakedAssignment};
@@ -70,7 +70,7 @@ fn setup_works() {
 /// Replicates the Kusama incident of 8th Dec 2022 and its resolution through the governance
 /// fallback.
 ///
-/// After enough slashes to exceed the `Staking::OffendingValidatorsThreshold`, the staking pallet
+/// After enough slashes exceeded the `Staking::OffendingValidatorsThreshold`, the staking pallet
 /// set `Forcing::ForceNew`. When a new session starts, staking will start to force a new era and
 /// calls <EPM as election_provider>::elect(). If at this point EPM and the staking miners did not
 /// have enough time to queue a new solution (snapshot + solution submission), the election request
@@ -103,9 +103,12 @@ fn enters_emergency_phase_after_forcing_before_elect() {
 		assert!(ElectionProviderMultiPhase::current_phase().is_emergency());
 		log_current_time();
 
+		let era_before_delayed_next = Staking::current_era();
 		// try to advance 2 eras with a delayed solution.
 		assert!(start_next_active_era_delayed_solution().is_ok());
+		assert_eq!(Staking::current_era(), era_before_delayed_next);
 		assert!(start_next_active_era_delayed_solution().is_ok());
+		assert_eq!(Staking::current_era(), era_before_delayed_next);
 
 		// EPM is still in emergency phase.
 		assert!(ElectionProviderMultiPhase::current_phase().is_emergency());
@@ -131,6 +134,7 @@ fn enters_emergency_phase_after_forcing_before_elect() {
 		log_current_time();
 		assert!(ElectionProviderMultiPhase::current_phase().is_signed());
 		assert_eq!(Session::validators(), vec![21, 31, 41]);
+		assert_eq!(Staking::current_era(), era_before_delayed_next.map(|e| e + 1));
 	});
 }
 

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

@@ -215,7 +215,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type MaxElectableTargets = MaxElectableTargets;
 	type MaxElectingVoters = MaxElectingVoters;
 	type MaxWinners = MaxWinners;
-	type BenchmarkingConfig = ElectionProviderBenchmarkConfig;
+	type BenchmarkingConfig = NoopElectionProviderBenchmarkConfig;
 	type WeightInfo = ();
 }
 
@@ -278,7 +278,7 @@ impl pallet_staking::Config for Runtime {
 	type HistoryDepth = HistoryDepth;
 	type OnStakerSlash = ();
 	type WeightInfo = pallet_staking::weights::SubstrateWeight<Runtime>;
-	type BenchmarkingConfig = StakingBenchmarkingConfig;
+	type BenchmarkingConfig = pallet_staking::TestBenchmarkingConfig;
 }
 
 impl<LocalCall> frame_system::offchain::SendTransactionTypes<LocalCall> for Runtime
@@ -309,22 +309,18 @@ impl onchain::Config for OnChainSeqPhragmen {
 	type TargetsBound = TargetsBound;
 }
 
-pub struct StakingBenchmarkingConfig;
-impl pallet_staking::BenchmarkingConfig for StakingBenchmarkingConfig {
-	type MaxNominators = traits::ConstU32<1000>;
-	type MaxValidators = traits::ConstU32<1000>;
-}
-
-pub struct ElectionProviderBenchmarkConfig;
+pub struct NoopElectionProviderBenchmarkConfig;
 
-impl pallet_election_provider_multi_phase::BenchmarkingConfig for ElectionProviderBenchmarkConfig {
-	const VOTERS: [u32; 2] = [1000, 2000];
-	const TARGETS: [u32; 2] = [500, 1000];
-	const ACTIVE_VOTERS: [u32; 2] = [500, 800];
-	const DESIRED_TARGETS: [u32; 2] = [200, 400];
-	const SNAPSHOT_MAXIMUM_VOTERS: u32 = 1000;
-	const MINER_MAXIMUM_VOTERS: u32 = 1000;
-	const MAXIMUM_TARGETS: u32 = 300;
+impl pallet_election_provider_multi_phase::BenchmarkingConfig
+	for NoopElectionProviderBenchmarkConfig
+{
+	const VOTERS: [u32; 2] = [0, 0];
+	const TARGETS: [u32; 2] = [0, 0];
+	const ACTIVE_VOTERS: [u32; 2] = [0, 0];
+	const DESIRED_TARGETS: [u32; 2] = [0, 0];
+	const SNAPSHOT_MAXIMUM_VOTERS: u32 = 0;
+	const MINER_MAXIMUM_VOTERS: u32 = 0;
+	const MAXIMUM_TARGETS: u32 = 0;
 }
 
 pub struct OtherSessionHandler;
@@ -384,7 +380,6 @@ impl Default for ExtBuilder {
 	}
 }
 
-
 impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
 		sp_tracing::try_init_simple();