fix: revert to old hook order execution

KILTprotocol · Feb 2, 2022 · 6363a5c · 6363a5c
1 parent d43f354
commit 6363a5c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/pallets/parachain-staking/src/mock.rs b/pallets/parachain-staking/src/mock.rs
@@ -59,10 +59,10 @@ construct_runtime!(
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-		Aura: pallet_aura::{Pallet, Storage},
-		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
-		StakePallet: stake::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Authorship: pallet_authorship::{Pallet, Call, Storage, Inherent},
+		StakePallet: stake::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
+		Aura: pallet_aura::{Pallet, Storage},
 	}
 );
 
@@ -364,14 +364,9 @@ pub(crate) fn roll_to(n: BlockNumber, authors: Vec<Option<AccountId>>) {
 		if let Some(Some(author)) = authors.get((System::block_number()) as usize) {
 			StakePallet::note_author(*author);
 		}
-		// TODO: Remove comments after settling on hook with coworkers
-		// <AllPalletsReversedWithSystemFirst as
-		// OnFinalize<u64>>::on_finalize(System::block_number());
-		<AllPalletsWithSystem as OnFinalize<u64>>::on_finalize(System::block_number());
+		<AllPalletsReversedWithSystemFirst as OnFinalize<u64>>::on_finalize(System::block_number());
 		System::set_block_number(System::block_number() + 1);
-		<AllPalletsWithSystem as OnInitialize<u64>>::on_initialize(System::block_number());
-		// <AllPalletsReversedWithSystemFirst as
-		// OnInitialize<u64>>::on_initialize(System::block_number());
+		<AllPalletsReversedWithSystemFirst as OnInitialize<u64>>::on_initialize(System::block_number());
 	}
 }
 

diff --git a/runtimes/peregrine/src/lib.rs b/runtimes/peregrine/src/lib.rs
@@ -867,7 +867,9 @@ pub type Executive = frame_executive::Executive<
 	Block,
 	frame_system::ChainContext<Runtime>,
 	Runtime,
-	AllPalletsWithSystem,
+	// Executes pallet hooks in reverse order of definition in construct_runtime
+	// If we want to switch to AllPalletsWithSystem, we need to reorder the staking pallets
+	AllPalletsReversedWithSystemFirst,
 	SchedulerMigrationV3,
 >;
 

diff --git a/runtimes/spiritnet/src/lib.rs b/runtimes/spiritnet/src/lib.rs
@@ -871,7 +871,9 @@ pub type Executive = frame_executive::Executive<
 	Block,
 	frame_system::ChainContext<Runtime>,
 	Runtime,
-	AllPalletsWithSystem,
+	// Executes pallet hooks in reverse order of definition in construct_runtime
+	// If we want to switch to AllPalletsWithSystem, we need to reorder the staking pallets
+	AllPalletsReversedWithSystemFirst,
 	SchedulerMigrationV3,
 >;