Remove unwanted changes

Author: skunert

polkadot/runtime/parachains/src/initializer.rs

@@ -304,7 +304,7 @@ impl<T: Config> Pallet<T> {
 
 		if session_index == 0 {
 			// Genesis session should be immediately enacted.
-			Self::apply_new_session(0, validators.clone(), queued.clone());
+			Self::apply_new_session(0, validators, queued);
 		} else {
 			BufferedSessionChanges::<T>::mutate(|v| {
 				v.push(BufferedSessionChange { validators, queued, session_index })

substrate/frame/aura/src/lib.rs

@@ -198,7 +198,7 @@ impl<T: Config> Pallet<T> {
 		if new.is_empty() {
 			log::warn!(target: LOG_TARGET, "Ignoring empty authority change.");
 
-			return;
+			return
 		}
 
 		<Authorities<T>>::put(&new);
@@ -217,6 +217,7 @@ impl<T: Config> Pallet<T> {
 	/// The authorities length must be equal or less than T::MaxAuthorities.
 	pub fn initialize_authorities(authorities: &[T::AuthorityId]) {
 		if !authorities.is_empty() {
+			assert!(<Authorities<T>>::get().is_empty(), "Authorities are already initialized!");
 			let bounded = <BoundedSlice<'_, _, T::MaxAuthorities>>::try_from(authorities)
 				.expect("Initial authority set must be less than T::MaxAuthorities");
 			<Authorities<T>>::put(bounded);
@@ -234,7 +235,7 @@ impl<T: Config> Pallet<T> {
 		let pre_runtime_digests = digest.logs.iter().filter_map(|d| d.as_pre_runtime());
 		for (id, mut data) in pre_runtime_digests {
 			if id == AURA_ENGINE_ID {
-				return Slot::decode(&mut data).ok();
+				return Slot::decode(&mut data).ok()
 			}
 		}
 
@@ -352,7 +353,7 @@ impl<T: Config> FindAuthor<u32> for Pallet<T> {
 			if id == AURA_ENGINE_ID {
 				let slot = Slot::decode(&mut data).ok()?;
 				let author_index = *slot % Self::authorities_len() as u64;
-				return Some(author_index as u32);
+				return Some(author_index as u32)
 			}
 		}
 

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

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

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

@@ -143,16 +143,14 @@ mod tests {
 	};
 
 	use codec::Encode;
-	use frame_support::pallet_prelude::Hooks;
 	use sp_core::{
 		crypto::key_types::DUMMY,
 		offchain::{testing::TestOffchainExt, OffchainDbExt, OffchainWorkerExt, StorageKind},
 	};
 	use sp_runtime::{testing::UintAuthorityId, BuildStorage};
 	use sp_state_machine::BasicExternalities;
 
-	use frame_support::traits::{KeyOwnerProofSystem, OnInitialize};
-	use frame_system::pallet_prelude::BlockNumberFor;
+	use frame_support::traits::{KeyOwnerProofSystem, OnGenesis, OnInitialize};
 
 	type Historical = Pallet<Test>;
 
@@ -178,7 +176,7 @@ mod tests {
 			.unwrap();
 
 		BasicExternalities::execute_with_storage(&mut t, || {
-			<Session as Hooks<BlockNumberFor<Test>>>::on_genesis();
+			Session::on_genesis();
 		});
 
 		let mut ext = sp_io::TestExternalities::new(t);
@@ -239,7 +237,7 @@ mod tests {
 			force_new_session();
 
 			System::set_block_number(1);
-			<Session as OnInitialize<BlockNumberFor<Test>>>::on_initialize(1);
+			Session::on_initialize(1);
 
 			// "on-chain"
 			onchain::store_current_session_validator_set_to_offchain::<Test>();
@@ -254,7 +252,7 @@ mod tests {
 
 		ext.execute_with(|| {
 			System::set_block_number(2);
-			<Session as OnInitialize<BlockNumberFor<Test>>>::on_initialize(2);
+			Session::on_initialize(2);
 			assert_eq!(<SessionModule<Test>>::current_index(), 2);
 
 			// "off-chain"