Fix pallet-session tests

Author: skunert

substrate/frame/session/src/historical/mod.rs

@@ -380,7 +380,8 @@ pub(crate) mod tests {
 	use sp_runtime::{key_types::DUMMY, testing::UintAuthorityId, BuildStorage};
 	use sp_state_machine::BasicExternalities;
 
-	use frame_support::traits::{KeyOwnerProofSystem, OnInitialize};
+	use frame_support::traits::{Hooks, KeyOwnerProofSystem, OnInitialize};
+	use frame_system::pallet_prelude::BlockNumberFor;
 
 	type Historical = Pallet<Test>;
 
@@ -399,6 +400,9 @@ pub(crate) mod tests {
 		pallet_session::GenesisConfig::<Test> { keys, ..Default::default() }
 			.assimilate_storage(&mut t)
 			.unwrap();
+		BasicExternalities::execute_with_storage(&mut t, || {
+			<Session as Hooks<BlockNumberFor<Test>>>::on_genesis();
+		});
 		sp_io::TestExternalities::new(t)
 	}
 
@@ -409,7 +413,7 @@ pub(crate) mod tests {
 			force_new_session();
 
 			System::set_block_number(1);
-			Session::on_initialize(1);
+			<Session as OnInitialize<BlockNumberFor<Test>>>::on_initialize(1);
 
 			let encoded_key_1 = UintAuthorityId(1).encode();
 			let proof = Historical::prove((DUMMY, &encoded_key_1[..])).unwrap();
@@ -421,7 +425,7 @@ pub(crate) mod tests {
 			force_new_session();
 
 			System::set_block_number(2);
-			Session::on_initialize(2);
+			<Session as OnInitialize<BlockNumberFor<Test>>>::on_initialize(2);
 
 			assert!(Historical::historical_root(proof.session).is_some());
 			assert!(Session::current_index() > proof.session);
@@ -433,7 +437,7 @@ pub(crate) mod tests {
 
 			force_new_session();
 			System::set_block_number(3);
-			Session::on_initialize(3);
+			<Session as OnInitialize<BlockNumberFor<Test>>>::on_initialize(3);
 		});
 	}
 
@@ -445,7 +449,7 @@ pub(crate) mod tests {
 				force_new_session();
 
 				System::set_block_number(i);
-				Session::on_initialize(i);
+				<Session as OnInitialize<BlockNumberFor<Test>>>::on_initialize(i);
 			}
 
 			assert_eq!(<StoredRange<Test>>::get(), Some((0, 100)));
@@ -475,7 +479,7 @@ pub(crate) mod tests {
 				force_new_session();
 
 				System::set_block_number(i);
-				Session::on_initialize(i);
+				<Session as OnInitialize<BlockNumberFor<Test>>>::on_initialize(i);
 			}
 
 			assert_eq!(<StoredRange<Test>>::get(), Some((100, 200)));

substrate/frame/session/src/historical/offchain.rs

@@ -143,6 +143,7 @@ mod tests {
 	};
 
 	use codec::Encode;
+	use frame_support::pallet_prelude::Hooks;
 	use sp_core::{
 		crypto::key_types::DUMMY,
 		offchain::{testing::TestOffchainExt, OffchainDbExt, OffchainWorkerExt, StorageKind},
@@ -151,6 +152,7 @@ mod tests {
 	use sp_state_machine::BasicExternalities;
 
 	use frame_support::traits::{KeyOwnerProofSystem, OnInitialize};
+	use frame_system::pallet_prelude::BlockNumberFor;
 
 	type Historical = Pallet<Test>;
 
@@ -175,6 +177,10 @@ mod tests {
 			.assimilate_storage(&mut t)
 			.unwrap();
 
+		BasicExternalities::execute_with_storage(&mut t, || {
+			<Session as Hooks<BlockNumberFor<Test>>>::on_genesis();
+		});
+
 		let mut ext = sp_io::TestExternalities::new(t);
 
 		let (offchain, offchain_state) = TestOffchainExt::with_offchain_db(ext.offchain_db());
@@ -233,7 +239,7 @@ mod tests {
 			force_new_session();
 
 			System::set_block_number(1);
-			Session::on_initialize(1);
+			<Session as OnInitialize<BlockNumberFor<Test>>>::on_initialize(1);
 
 			// "on-chain"
 			onchain::store_current_session_validator_set_to_offchain::<Test>();
@@ -248,7 +254,7 @@ mod tests {
 
 		ext.execute_with(|| {
 			System::set_block_number(2);
-			Session::on_initialize(2);
+			<Session as OnInitialize<BlockNumberFor<Test>>>::on_initialize(2);
 			assert_eq!(<SessionModule<Test>>::current_index(), 2);
 
 			// "off-chain"

substrate/frame/session/src/mock.rs

@@ -29,7 +29,10 @@ use sp_runtime::{impl_opaque_keys, testing::UintAuthorityId, BuildStorage};
 use sp_staking::SessionIndex;
 use sp_state_machine::BasicExternalities;
 
-use frame_support::{derive_impl, parameter_types, traits::ConstU64};
+use frame_support::{
+	derive_impl, parameter_types,
+	traits::{ConstU64, Hooks},
+};
 
 impl_opaque_keys! {
 	pub struct MockSessionKeys {
@@ -218,6 +221,9 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	pallet_session::GenesisConfig::<Test> { keys, ..Default::default() }
 		.assimilate_storage(&mut t)
 		.unwrap();
+	BasicExternalities::execute_with_storage(&mut t, || {
+		<pallet_session::Pallet<Test> as Hooks<BlockNumberFor<Test>>>::on_genesis();
+	});
 
 	let v = NextValidators::get().iter().map(|&i| (i, i)).collect();
 	ValidatorAccounts::mutate(|m| *m = v);