fix migrations

bin/runtime/src/lib.rs

@@ -653,7 +653,7 @@ parameter_types! {
     pub DeletionQueueDepth: u32 = DeletionWeightLimit::get().saturating_div((
             <Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(1) -
             <Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(0)
-        ).ref_time()) * 10).ref_time() as u32; // 2228
+        ).ref_time() * 10).ref_time() as u32; // 2228
     pub Schedule: pallet_contracts::Schedule<Runtime> = Default::default();
 }
 

pallets/aleph/src/migrations/v0_to_v1.rs

@@ -79,7 +79,7 @@ impl<T: Config, P: PalletInfoAccess> OnRuntimeUpgrade for Migration<T, P> {
     }
 
     #[cfg(feature = "try-runtime")]
-    fn pre_upgrade() -> Result<(), &'static str> {
+    fn pre_upgrade() -> Result<Vec<u8>, &'static str> {
         #[storage_alias]
         type SessionForValidatorsChange = StorageValue<Aleph, Option<SessionIndex>>;
         #[storage_alias]
@@ -90,11 +90,11 @@ impl<T: Config, P: PalletInfoAccess> OnRuntimeUpgrade for Migration<T, P> {
         Self::store_temp("session", SessionForValidatorsChange::get());
         Self::store_temp("validators", Validators::<T>::get());
 
-        Ok(())
+        Ok(Vec::new())
     }
 
     #[cfg(feature = "try-runtime")]
-    fn post_upgrade() -> Result<(), &'static str> {
+    fn post_upgrade(_state: Vec<u8>) -> Result<(), &'static str> {
         ensure_storage_version::<P>(1)?;
 
         let new_session = SessionForValidatorsChange::get();

pallets/aleph/src/migrations/v1_to_v2.rs

@@ -8,6 +8,7 @@ use frame_support::{
 #[cfg(feature = "try-runtime")]
 use pallets_support::ensure_storage_version;
 use pallets_support::StorageMigration;
+use sp_std::vec::Vec;
 
 use crate::Config;
 
@@ -81,12 +82,13 @@ impl<T: Config, P: PalletInfoAccess> OnRuntimeUpgrade for Migration<T, P> {
     }
 
     #[cfg(feature = "try-runtime")]
-    fn pre_upgrade() -> Result<(), &'static str> {
-        ensure_storage_version::<P>(1)
+    fn pre_upgrade() -> Result<Vec<u8>, &'static str> {
+        ensure_storage_version::<P>(1)?;
+        Ok(Vec::new())
     }
 
     #[cfg(feature = "try-runtime")]
-    fn post_upgrade() -> Result<(), &'static str> {
+    fn post_upgrade(_state: Vec<u8>) -> Result<(), &'static str> {
         ensure_storage_version::<P>(2)?;
 
         ensure!(

pallets/elections/src/migrations/v0_to_v1.rs

@@ -83,17 +83,17 @@ impl<T: Config, P: PalletInfoAccess> OnRuntimeUpgrade for Migration<T, P> {
     }
 
     #[cfg(feature = "try-runtime")]
-    fn pre_upgrade() -> Result<(), &'static str> {
+    fn pre_upgrade() -> Result<Vec<u8>, &'static str> {
         ensure_storage_version::<P>(0)?;
 
         let members = Members::<T>::get().ok_or("No `Members` storage")?;
         Self::store_temp("members", members);
 
-        Ok(())
+        Ok(Vec::new())
     }
 
     #[cfg(feature = "try-runtime")]
-    fn post_upgrade() -> Result<(), &'static str> {
+    fn post_upgrade(_state: Vec<u8>) -> Result<(), &'static str> {
         ensure_storage_version::<P>(1)?;
 
         let mps = MembersPerSession::get().ok_or("No `MembersPerSession` in the storage")?;

pallets/elections/src/migrations/v1_to_v2.rs

@@ -8,6 +8,7 @@ use frame_support::{
 #[cfg(feature = "try-runtime")]
 use pallets_support::ensure_storage_version;
 use pallets_support::StorageMigration;
+use sp_std::vec::Vec;
 
 use crate::{migrations::Validators, Config, EraValidators};
 
@@ -82,7 +83,7 @@ impl<T: Config, P: PalletInfoAccess> OnRuntimeUpgrade for Migration<T, P> {
     }
 
     #[cfg(feature = "try-runtime")]
-    fn pre_upgrade() -> Result<(), &'static str> {
+    fn pre_upgrade() -> Result<Vec<u8>, &'static str> {
         ensure_storage_version::<P>(1)?;
 
         let members_per_session =
@@ -100,11 +101,11 @@ impl<T: Config, P: PalletInfoAccess> OnRuntimeUpgrade for Migration<T, P> {
         let eras_members = ErasMembers::<T>::get().ok_or("No `ErasMembers` in the storage")?;
         Self::store_temp("eras_members", eras_members);
 
-        Ok(())
+        Ok(Vec::new())
     }
 
     #[cfg(feature = "try-runtime")]
-    fn post_upgrade() -> Result<(), &'static str> {
+    fn post_upgrade(_state: Vec<u8>) -> Result<(), &'static str> {
         ensure_storage_version::<P>(2)?;
 
         let committee_size = CommitteeSize::get().ok_or("No `CommitteeSize` in the storage")?;

pallets/elections/src/migrations/v2_to_v3.rs

@@ -9,6 +9,7 @@ use frame_support::{
 use pallets_support::ensure_storage_version;
 use pallets_support::StorageMigration;
 use primitives::CommitteeSeats;
+use sp_std::vec::Vec;
 
 use crate::{migrations::Validators, Config, EraValidators};
 
@@ -97,7 +98,7 @@ impl<T: Config, P: PalletInfoAccess> OnRuntimeUpgrade for Migration<T, P> {
     }
 
     #[cfg(feature = "try-runtime")]
-    fn pre_upgrade() -> Result<(), &'static str> {
+    fn pre_upgrade() -> Result<Vec<u8>, &'static str> {
         #[storage_alias]
         type CommitteeSize = StorageValue<Elections, u32>;
         #[storage_alias]
@@ -111,11 +112,11 @@ impl<T: Config, P: PalletInfoAccess> OnRuntimeUpgrade for Migration<T, P> {
         let next_era_committee_size = NextEraCommitteeSize::get();
         Self::store_temp("next_era_committee_size", next_era_committee_size);
 
-        Ok(())
+        Ok(Vec::new())
     }
 
     #[cfg(feature = "try-runtime")]
-    fn post_upgrade() -> Result<(), &'static str> {
+    fn post_upgrade(_state: Vec<u8>) -> Result<(), &'static str> {
         ensure_storage_version::<P>(3)?;
 
         let new_committee_size = CommitteeSize::get().ok_or("No `CommitteeSize` in the storage")?;

pallets/support/src/migration.rs

@@ -7,6 +7,7 @@ use frame_support::{
 use frame_support::{
     pallet_prelude::{PalletInfoAccess, StorageVersion, Weight},
     traits::OnRuntimeUpgrade,
+    sp_std::vec::Vec
 };
 
 /// In order to run both pre- and post- checks around every migration, we entangle methods of
@@ -25,7 +26,7 @@ pub trait StorageMigration: OnRuntimeUpgrade {
         let weight = Self::on_runtime_upgrade();
 
         #[cfg(feature = "try-runtime")]
-        Self::post_upgrade().expect("Post upgrade should succeed");
+        Self::post_upgrade(Vec::new()).expect("Post upgrade should succeed");
 
         weight
     }