Fixes

substrate/frame/society/src/mock.rs

@@ -223,8 +223,11 @@ pub fn conclude_intake(allow_resignation: bool, judge_intake: Option<bool>) {
 pub fn next_intake() {
 	let claim_period: u64 = <Test as Config>::ClaimPeriod::get();
 	match Society::period() {
-		Period::Voting { more, .. } => System::run_to_block::<AllPalletsWithSystem>(System::block_number() + more + claim_period),
-		Period::Claim { more, .. } => System::run_to_block::<AllPalletsWithSystem>(System::block_number() + more),
+		Period::Voting { more, .. } => System::run_to_block::<AllPalletsWithSystem>(
+			System::block_number() + more + claim_period,
+		),
+		Period::Claim { more, .. } =>
+			System::run_to_block::<AllPalletsWithSystem>(System::block_number() + more),
 	}
 }
 

substrate/frame/staking/src/mock.rs

@@ -155,7 +155,7 @@ impl pallet_session::historical::Config for Test {
 }
 impl pallet_authorship::Config for Test {
 	type FindAuthor = Author11;
-	type EventHandler = Pallet<Test>;
+	type EventHandler = ();
 }
 
 impl pallet_timestamp::Config for Test {
@@ -544,19 +544,13 @@ impl ExtBuilder {
 		let mut ext = sp_io::TestExternalities::from(storage);
 
 		if self.initialize_first_session {
-			// We consider all test to start after timestamp is initialized This must be ensured by
-			// having `timestamp::on_initialize` called before `staking::on_initialize`. Also, if
-			// session length is 1, then it is already triggered.
 			ext.execute_with(|| {
 				System::run_to_block_with::<AllPalletsWithSystem>(
 					1,
 					frame_system::RunToBlockHooks::default().after_initialize(|_| {
 						Timestamp::set_timestamp(INIT_TIMESTAMP);
 					}),
 				);
-
-				// Skip the genesis reward.
-				ErasRewardPoints::<Test>::remove(0);
 			});
 		}
 
@@ -639,30 +633,9 @@ pub(crate) fn start_session(end_session_idx: SessionIndex) {
 	} else {
 		Offset::get() + (end_session_idx.saturating_sub(1) as u64) * period
 	};
-	let start_session_idx = Session::current_index();
 
 	run_to_block(end);
 
-	let sessions_per_era = SessionsPerEra::get();
-
-	// Revert the `Authorship::OnInitialize`'s `note_author` reward for easy testing.
-	for i in start_session_idx..end_session_idx {
-		let blocks_per_session = if i == 0 {
-			// Skip block 0.
-			period - 1
-		} else {
-			period
-		};
-		let extra_reward_points = blocks_per_session as RewardPoint * 20;
-
-		ErasRewardPoints::<Test>::mutate(i / sessions_per_era, |p| {
-			if let Some(author_11) = p.individual.get_mut(&11) {
-				p.total = p.total.saturating_sub(extra_reward_points);
-				*author_11 = (*author_11).saturating_sub(extra_reward_points);
-			}
-		});
-	}
-
 	let curr_session_idx = Session::current_index();
 
 	// session must have progressed properly.

substrate/frame/staking/src/tests.rs

@@ -2395,7 +2395,7 @@ fn reward_from_authorship_event_handler_works() {
 
 #[test]
 fn add_reward_points_fns_works() {
-	ExtBuilder::default().initialize_first_session(false).build_and_execute(|| {
+	ExtBuilder::default().build_and_execute(|| {
 		// Not mandatory but must be coherent with rewards
 		assert_eq_uvec!(Session::validators(), vec![21, 11]);
 

substrate/frame/system/src/lib.rs

@@ -1975,7 +1975,10 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// Simulate the execution of a block sequence up to a specified height, injecting the
-	/// provided closures at each block.
+	/// provided hooks at each block.
+	///
+	/// `on_finalize` is always called before `on_initialize` with the current block number.
+	/// `on_initalize` is always called with the next block number.
 	///
 	/// These hooks allows custom logic to be executed at each block at specific location.
 	/// For example, you might use one of them to set a timestamp for each block.
@@ -2399,7 +2402,6 @@ where
 	after_initialize: Box<dyn 'a + FnMut(BlockNumberFor<T>)>,
 	before_finalize: Box<dyn 'a + FnMut(BlockNumberFor<T>)>,
 	after_finalize: Box<dyn 'a + FnMut(BlockNumberFor<T>)>,
-	_marker: PhantomData<&'a T>,
 }
 #[cfg(any(feature = "std", feature = "runtime-benchmarks", test))]
 impl<'a, T> RunToBlockHooks<'a, T>
@@ -2450,7 +2452,6 @@ where
 			after_initialize: Box::new(|_| {}),
 			before_finalize: Box::new(|_| {}),
 			after_finalize: Box::new(|_| {}),
-			_marker: Default::default(),
 		}
 	}
 }