one big round of refactors and tests, a lot left to do.

Author: kianenigma

Cargo.lock

@@ -520,8 +520,8 @@ pub mod pallet {
 		/// The origin that can perform administration operations on this pallet.
 		type AdminOrigin: EnsureOrigin<Self::RuntimeOrigin>;
 
-		/// An indicator of whether we should move to do the [`crate::types::Done`] or not? This is
-		/// called at the end of the election process.
+		/// An indicator of whether we should move to do the [`crate::types::Phase::Done`] or not?
+		/// This is called at the end of the election process.
 		///
 		/// Common implementation is [`ProceedRegardlessOf`] or [`RevertToSignedIfNotQueuedOf`].
 		type AreWeDone: Get<Phase<Self>>;

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

@@ -28,8 +28,6 @@ use sp_std::prelude::*;
 mod benchmarks {
 	use super::*;
 
-	// TODO: this is the epitome of bad DevEx because of generics.. create a nice one that works in
-	// frame_system.
 	fn events_for<T: Config>() -> Vec<Event<T>> {
 		frame_system::Pallet::<T>::events()
 			.into_iter()

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

@@ -16,19 +16,11 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { features = [
-	"derive",
-], workspace = true }
+codec = { features = [ "derive" ], workspace = true }
 frame-election-provider-support = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 log = { workspace = true }
-pallet-authorship = { workspace = true }
-# Should be removed after `pallet_session::migrations::v1::MigrateDisabledValidators` and
-# `MigrateV14ToV15` are executed
-pallet-session = { features = [
-	"historical",
-], workspace = true }
 pallet-staking-next-rc-client = { workspace = true }
 rand = { features = ["alloc"], workspace = true }
 rand_chacha = { workspace = true }
@@ -45,12 +37,10 @@ frame-benchmarking = { optional = true, workspace = true }
 
 [dev-dependencies]
 frame-benchmarking = { workspace = true, default-features = true }
-frame-election-provider-support = { workspace = true, default-features = true }
 frame-support = { features = ["experimental"], workspace = true, default-features = true }
 pallet-bags-list = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
 pallet-staking-next-reward-curve = { workspace = true, default-features = true }
-pallet-timestamp = { workspace = true, default-features = true }
 rand_chacha = { workspace = true, default-features = true }
 sp-npos-elections = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
@@ -65,12 +55,9 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
-	"pallet-authorship/std",
 	"pallet-bags-list/std",
 	"pallet-balances/std",
-	"pallet-session/std",
 	"pallet-staking-next-rc-client/std",
-	"pallet-timestamp/std",
 	"rand/std",
 	"rand_chacha/std",
 	"scale-info/std",
@@ -92,19 +79,15 @@ runtime-benchmarks = [
 	"pallet-bags-list/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-staking-next-rc-client/runtime-benchmarks",
-	"pallet-timestamp/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"sp-staking/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-election-provider-support/try-runtime",
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"pallet-authorship/try-runtime",
 	"pallet-bags-list/try-runtime",
 	"pallet-balances/try-runtime",
-	"pallet-session/try-runtime",
 	"pallet-staking-next-rc-client/try-runtime",
-	"pallet-timestamp/try-runtime",
 	"sp-runtime/try-runtime",
 ]

substrate/frame/staking-next/Cargo.toml

@@ -169,6 +169,7 @@ impl multi_block::Config for Runtime {
 	type TargetSnapshotPerBlock = TargetSnapshotPerBlock;
 	type VoterSnapshotPerBlock = VoterSnapshotPerBlock;
 	type Verifier = MultiBlockVerifier;
+	type AreWeDone = multi_block::ProceedRegardlessOf<Self>;
 	type WeightInfo = multi_block::weights::AllZeroWeights;
 }
 
@@ -219,7 +220,7 @@ parameter_types! {
 	pub static BondingDuration: u32 = 3;
 	pub static SlashDeferredDuration: u32 = 2;
 	pub static SessionsPerEra: u32 = 6;
-	pub static ElectionOffset: u32 = 1;
+	pub static PlanningEraOffset: u32 = 1;
 }
 
 impl pallet_staking_next::Config for Runtime {
@@ -231,7 +232,7 @@ impl pallet_staking_next::Config for Runtime {
 	type BenchmarkingConfig = pallet_staking_next::TestBenchmarkingConfig;
 	type BondingDuration = BondingDuration;
 	type SessionsPerEra = SessionsPerEra;
-	type ElectionOffset = ElectionOffset;
+	type PlanningEraOffset = PlanningEraOffset;
 
 	type Currency = Balances;
 	type OldCurrency = Balances;
@@ -263,9 +264,6 @@ impl pallet_staking_next::Config for Runtime {
 
 	type RcClientInterface = RcClient;
 
-	// TODO
-	type NextNewSession = ();
-
 	type WeightInfo = ();
 }
 
@@ -331,7 +329,7 @@ impl ExtBuilder {
 
 		let validators = vec![1, 2, 3, 4, 5, 6, 7, 8]
 			.into_iter()
-			.map(|x| (x, x, INITIAL_STAKE, pallet_staking_next::StakerStatus::Validator));
+			.map(|x| (x, INITIAL_STAKE, pallet_staking_next::StakerStatus::Validator));
 
 		let nominators = vec![
 			(100, vec![1, 2]),
@@ -351,14 +349,14 @@ impl ExtBuilder {
 		.into_iter()
 		.map(|(x, y)| {
 			let y = y.into_iter().map(|x| x).collect::<Vec<_>>();
-			(x, x, INITIAL_STAKE, pallet_staking_next::StakerStatus::Nominator(y))
+			(x, INITIAL_STAKE, pallet_staking_next::StakerStatus::Nominator(y))
 		});
 
 		let stakers = validators.chain(nominators).collect::<Vec<_>>();
 		let balances = stakers
 			.clone()
 			.into_iter()
-			.map(|(x, _, _, _)| (x, INITIAL_BALANCE))
+			.map(|(x, _, _)| (x, INITIAL_BALANCE))
 			.collect::<Vec<_>>();
 
 		pallet_balances::GenesisConfig::<Runtime> { balances, ..Default::default() }

substrate/frame/staking-next/ahm-test/src/ah/mock.rs

@@ -3,7 +3,7 @@ use crate::ah::mock::*;
 use frame_support::assert_ok;
 use pallet_election_provider_multi_block::{Event as ElectionEvent, Phase};
 use pallet_staking_next::{
-	ActiveEra, ActiveEraInfo, CurrentEra, CurrentPlannedSession, Event as StakingEvent,
+	ActiveEra, ActiveEraInfo, CurrentEra, Event as StakingEvent,
 };
 use pallet_staking_next_rc_client as rc_client;
 use pallet_staking_next_rc_client::ValidatorSetReport;
@@ -14,7 +14,6 @@ fn on_receive_session_report() {
 	ExtBuilder::default().local_queue().build().execute_with(|| {
 		// GIVEN genesis state of ah
 		assert_eq!(System::block_number(), 1);
-		assert_eq!(CurrentPlannedSession::<T>::get(), 0);
 		assert_eq!(CurrentEra::<T>::get(), Some(0));
 		assert_eq!(pallet_staking_next::ErasStartSessionIndex::<T>::get(0), Some(0));
 		assert_eq!(ActiveEra::<T>::get(), Some(ActiveEraInfo { index: 0, start: Some(0) }));
@@ -33,7 +32,6 @@ fn on_receive_session_report() {
 		));
 
 		// THEN end 0, start 1, plan 2
-		assert_eq!(CurrentPlannedSession::<T>::get(), 2);
 		let era_points = pallet_staking_next::ErasRewardPoints::<T>::get(&0);
 		assert_eq!(era_points.total, 360);
 		assert_eq!(era_points.individual.get(&1), Some(&10));
@@ -87,9 +85,6 @@ fn on_receive_session_report() {
 			);
 		}
 
-		// current planned session is 4 (ongoing 3, last ended 2)
-		assert_eq!(CurrentPlannedSession::<T>::get(), 4);
-
 		// Next session we will begin election.
 		assert_ok!(rc_client::Pallet::<T>::relay_session_report(
 			RuntimeOrigin::root(),
@@ -212,8 +207,6 @@ fn roll_many_eras() {
 					leftover: false,
 				}
 			));
-			// planned session is two ahead of end session.
-			assert_eq!(CurrentPlannedSession::<T>::get(), session_counter + 2);
 
 			// increment session for the next iteration.
 			session_counter += 1;
@@ -256,6 +249,21 @@ fn roll_many_eras() {
 	});
 }
 
+#[test]
+fn receives_too_many_session_reports_at_once() {
+	todo!()
+}
+
+#[test]
+fn receives_session_old_session_report() {
+	todo!()
+}
+
+#[test]
+fn receives_session_report_in_future() {
+	todo!()
+}
+
 #[test]
 fn on_new_offence() {
 	// todo(ank4n):

substrate/frame/staking-next/ahm-test/src/ah/test.rs

@@ -23,7 +23,6 @@ mod tests {
 		// initial state of ah
 		shared::in_ah(|| {
 			assert_eq!(frame_system::Pallet::<ah::Runtime>::block_number(), 1);
-			assert_eq!(pallet_staking_next::CurrentPlannedSession::<ah::Runtime>::get(), 0);
 			assert_eq!(pallet_staking_next::CurrentEra::<ah::Runtime>::get(), Some(0));
 			assert_eq!(
 				ActiveEra::<ah::Runtime>::get(),
@@ -57,7 +56,6 @@ mod tests {
 		shared::in_ah(|| {
 			// ah's rc-client has also progressed some blocks, equal to 4 sessions
 			assert_eq!(frame_system::Pallet::<ah::Runtime>::block_number(), 121);
-			assert_eq!(pallet_staking_next::CurrentPlannedSession::<ah::Runtime>::get(), 5);
 			// election is ongoing, and has just started
 			assert!(matches!(
 				multi_block::CurrentPhase::<ah::Runtime>::get(),

substrate/frame/staking-next/ahm-test/src/lib.rs

@@ -260,7 +260,6 @@ impl pallet_staking_next::Config for Runtime {
 	type AdminOrigin = EitherOf<EnsureRoot<AccountId>, StakingAdmin>;
 	type EraPayout = EraPayout;
 	type MaxExposurePageSize = MaxExposurePageSize;
-	type NextNewSession = Session;
 	type ElectionProvider = MultiBlock;
 	type GenesisElectionProvider = onchain::OnChainExecution<OnChainSeqPhragmen>;
 	type VoterList = VoterList;
@@ -275,7 +274,7 @@ impl pallet_staking_next::Config for Runtime {
 	type WeightInfo = weights::pallet_staking_next::WeightInfo<Runtime>;
 	type MaxInvulnerables = frame_support::traits::ConstU32<20>;
 	type MaxDisabledValidators = ConstU32<100>;
-	type ElectionOffset = ConstU32<2>;
+	type PlanningEraOffset = ConstU32<2>;
 	type RcClientInterface = StakingRcClient;
 }
 

substrate/frame/staking-next/runtimes/parachain/src/staking.rs

@@ -115,12 +115,6 @@ pub fn create_validator_with_nominators<T: Config>(
 	MinimumValidatorCount::<T>::put(1);
 
 	// Start a new (genesis) Era
-	// populate electable stashes as it gets read within `try_plan_new_era`
-
-	// ElectableStashes::<T>::put(
-	// 	BoundedBTreeSet::try_from(vec![v_stash.clone()].into_iter().collect::<BTreeSet<_>>())
-	// 		.unwrap(),
-	// );
 	let new_validators = Staking::<T>::try_plan_new_era(SessionIndex::one(), true).unwrap();
 
 	assert_eq!(new_validators.len(), 1);