diff --git a/pallets/maintenance-mode/src/lib.rs b/pallets/maintenance-mode/src/lib.rs index 00f0039ee7..359c610a35 100644 --- a/pallets/maintenance-mode/src/lib.rs +++ b/pallets/maintenance-mode/src/lib.rs @@ -115,7 +115,7 @@ pub mod pallet { #[cfg(feature = "xcm-support")] type MaintenanceDmpHandler: DmpMessageHandler; /// The executive hooks that will be used in normal operating mode - /// Important: Use AllPalletsReversedWithSystemFirst here if you dont want to modify the + /// Important: Use AllPalletsWithSystem here if you dont want to modify the /// hooks behaviour type NormalExecutiveHooks: OnRuntimeUpgrade + OnInitialize @@ -123,7 +123,7 @@ pub mod pallet { + OnFinalize + OffchainWorker; /// The executive hooks that will be used in maintenance mode - /// Important: Use AllPalletsReversedWithSystemFirst here if you dont want to modify the + /// Important: Use AllPalletsWithSystem here if you dont want to modify the /// hooks behaviour type MaintenanceExecutiveHooks: OnRuntimeUpgrade + OnInitialize diff --git a/runtime/moonbase/src/lib.rs b/runtime/moonbase/src/lib.rs index 8ebaa98c90..04788fd4af 100644 --- a/runtime/moonbase/src/lib.rs +++ b/runtime/moonbase/src/lib.rs @@ -960,8 +960,7 @@ pub struct MaintenanceHooks; impl OnInitialize for MaintenanceHooks { fn on_initialize(n: BlockNumber) -> Weight { - #[allow(deprecated)] - AllPalletsReversedWithSystemFirst::on_initialize(n) + AllPalletsWithSystem::on_initialize(n) } } @@ -979,33 +978,28 @@ impl OnIdle for MaintenanceHooks { impl OnRuntimeUpgrade for MaintenanceHooks { fn on_runtime_upgrade() -> Weight { - #[allow(deprecated)] - AllPalletsReversedWithSystemFirst::on_runtime_upgrade() + AllPalletsWithSystem::on_runtime_upgrade() } #[cfg(feature = "try-runtime")] fn pre_upgrade() -> Result<(), &'static str> { - #[allow(deprecated)] - AllPalletsReversedWithSystemFirst::pre_upgrade() + AllPalletsWithSystem::pre_upgrade() } #[cfg(feature = "try-runtime")] fn post_upgrade() -> Result<(), &'static str> { - #[allow(deprecated)] - AllPalletsReversedWithSystemFirst::post_upgrade() + AllPalletsWithSystem::post_upgrade() } } impl OnFinalize for MaintenanceHooks { fn on_finalize(n: BlockNumber) { - #[allow(deprecated)] - AllPalletsReversedWithSystemFirst::on_finalize(n) + AllPalletsWithSystem::on_finalize(n) } } impl OffchainWorker for MaintenanceHooks { fn offchain_worker(n: BlockNumber) { - #[allow(deprecated)] - AllPalletsReversedWithSystemFirst::offchain_worker(n) + AllPalletsWithSystem::offchain_worker(n) } } @@ -1018,10 +1012,9 @@ impl pallet_maintenance_mode::Config for Runtime { type XcmExecutionManager = XcmExecutionManager; type NormalDmpHandler = DmpQueue; type MaintenanceDmpHandler = MaintenanceDmpHandler; - // We use AllPalletsReversedWithSystemFirst because we dont want to change the hooks in normal + // We use AllPalletsWithSystem because we dont want to change the hooks in normal // operation - #[allow(deprecated)] - type NormalExecutiveHooks = AllPalletsReversedWithSystemFirst; + type NormalExecutiveHooks = AllPalletsWithSystem; type MaintenanceExecutiveHooks = MaintenanceHooks; } diff --git a/runtime/moonbeam/src/lib.rs b/runtime/moonbeam/src/lib.rs index 73f7196756..1afbf010d5 100644 --- a/runtime/moonbeam/src/lib.rs +++ b/runtime/moonbeam/src/lib.rs @@ -1014,8 +1014,7 @@ pub struct MaintenanceHooks; impl OnInitialize for MaintenanceHooks { fn on_initialize(n: BlockNumber) -> Weight { - #[allow(deprecated)] - AllPalletsReversedWithSystemFirst::on_initialize(n) + AllPalletsWithSystem::on_initialize(n) } } @@ -1033,33 +1032,28 @@ impl OnIdle for MaintenanceHooks { impl OnRuntimeUpgrade for MaintenanceHooks { fn on_runtime_upgrade() -> Weight { - #[allow(deprecated)] - AllPalletsReversedWithSystemFirst::on_runtime_upgrade() + AllPalletsWithSystem::on_runtime_upgrade() } #[cfg(feature = "try-runtime")] fn pre_upgrade() -> Result<(), &'static str> { - #[allow(deprecated)] - AllPalletsReversedWithSystemFirst::pre_upgrade() + AllPalletsWithSystem::pre_upgrade() } #[cfg(feature = "try-runtime")] fn post_upgrade() -> Result<(), &'static str> { - #[allow(deprecated)] - AllPalletsReversedWithSystemFirst::post_upgrade() + AllPalletsWithSystem::post_upgrade() } } impl OnFinalize for MaintenanceHooks { fn on_finalize(n: BlockNumber) { - #[allow(deprecated)] - AllPalletsReversedWithSystemFirst::on_finalize(n) + AllPalletsWithSystem::on_finalize(n) } } impl OffchainWorker for MaintenanceHooks { fn offchain_worker(n: BlockNumber) { - #[allow(deprecated)] - AllPalletsReversedWithSystemFirst::offchain_worker(n) + AllPalletsWithSystem::offchain_worker(n) } } @@ -1072,10 +1066,9 @@ impl pallet_maintenance_mode::Config for Runtime { type XcmExecutionManager = XcmExecutionManager; type NormalDmpHandler = DmpQueue; type MaintenanceDmpHandler = MaintenanceDmpHandler; - // We use AllPalletsReversedWithSystemFirst because we dont want to change the hooks in normal + // We use AllPalletsWithSystem because we dont want to change the hooks in normal // operation - #[allow(deprecated)] - type NormalExecutiveHooks = AllPalletsReversedWithSystemFirst; + type NormalExecutiveHooks = AllPalletsWithSystem; type MaintenanceExecutiveHooks = MaintenanceHooks; } diff --git a/runtime/moonriver/src/lib.rs b/runtime/moonriver/src/lib.rs index c3d995e31a..b52beaa6b3 100644 --- a/runtime/moonriver/src/lib.rs +++ b/runtime/moonriver/src/lib.rs @@ -1015,8 +1015,7 @@ pub struct MaintenanceHooks; impl OnInitialize for MaintenanceHooks { fn on_initialize(n: BlockNumber) -> Weight { - #[allow(deprecated)] - AllPalletsReversedWithSystemFirst::on_initialize(n) + AllPalletsWithSystem::on_initialize(n) } } @@ -1034,33 +1033,28 @@ impl OnIdle for MaintenanceHooks { impl OnRuntimeUpgrade for MaintenanceHooks { fn on_runtime_upgrade() -> Weight { - #[allow(deprecated)] - AllPalletsReversedWithSystemFirst::on_runtime_upgrade() + AllPalletsWithSystem::on_runtime_upgrade() } #[cfg(feature = "try-runtime")] fn pre_upgrade() -> Result<(), &'static str> { - #[allow(deprecated)] - AllPalletsReversedWithSystemFirst::pre_upgrade() + AllPalletsWithSystem::pre_upgrade() } #[cfg(feature = "try-runtime")] fn post_upgrade() -> Result<(), &'static str> { - #[allow(deprecated)] - AllPalletsReversedWithSystemFirst::post_upgrade() + AllPalletsWithSystem::post_upgrade() } } impl OnFinalize for MaintenanceHooks { fn on_finalize(n: BlockNumber) { - #[allow(deprecated)] - AllPalletsReversedWithSystemFirst::on_finalize(n) + AllPalletsWithSystem::on_finalize(n) } } impl OffchainWorker for MaintenanceHooks { fn offchain_worker(n: BlockNumber) { - #[allow(deprecated)] - AllPalletsReversedWithSystemFirst::offchain_worker(n) + AllPalletsWithSystem::offchain_worker(n) } } @@ -1073,10 +1067,9 @@ impl pallet_maintenance_mode::Config for Runtime { type XcmExecutionManager = XcmExecutionManager; type NormalDmpHandler = DmpQueue; type MaintenanceDmpHandler = MaintenanceDmpHandler; - // We use AllPalletsReversedWithSystemFirst because we dont want to change the hooks in normal + // We use AllPalletsWithSystem because we dont want to change the hooks in normal // operation - #[allow(deprecated)] - type NormalExecutiveHooks = AllPalletsReversedWithSystemFirst; + type NormalExecutiveHooks = AllPalletsWithSystem; type MaintenanceExecutiveHooks = MaintenanceHooks; }