Fix the migrations for upcoming release (#4692)

This commit is contained in:
Kian Paimani
2022-01-13 07:52:03 +01:00
committed by GitHub
parent fc7e6047d9
commit 12d1600267
2 changed files with 7 additions and 10 deletions
+4 -3
View File
@@ -1478,7 +1478,7 @@ pub type Executive = frame_executive::Executive<
frame_system::ChainContext<Runtime>,
Runtime,
AllPalletsWithSystem,
(SessionHistoricalPalletPrefixMigration, SchedulerMigrationV3),
(SchedulerMigrationV3, RefundNickPalletDeposit),
>;
/// The payload being signed in the transactions.
pub type SignedPayload = generic::SignedPayload<Call, SignedExtra>;
@@ -2885,8 +2885,9 @@ impl OnRuntimeUpgrade for RefundNickPalletDeposit {
}
#[cfg(feature = "try-runtime")]
fn pre_migrate() -> Result<(), &'static str> {
Self::execute(true)
fn pre_upgrade() -> Result<(), &'static str> {
let _ = Self::execute(true);
Ok(())
}
}
+3 -7
View File
@@ -1427,12 +1427,7 @@ pub type Executive = frame_executive::Executive<
frame_system::ChainContext<Runtime>,
Runtime,
AllPalletsWithSystem,
(
StakingBagsListMigrationV8,
SessionHistoricalPalletPrefixMigration,
SchedulerMigrationV3,
FixCouncilDepositMigration,
),
(SchedulerMigrationV3, FixCouncilDepositMigration),
>;
/// The payload being signed in transactions.
pub type SignedPayload = generic::SignedPayload<Call, SignedExtra>;
@@ -1626,7 +1621,8 @@ impl OnRuntimeUpgrade for FixCouncilDepositMigration {
#[cfg(feature = "try-runtime")]
fn pre_upgrade() -> Result<(), &'static str> {
Self::execute(true)
let _ = Self::execute(true);
Ok(())
}
}