diff --git a/state-chain/pallets/cf-vaults/src/lib.rs b/state-chain/pallets/cf-vaults/src/lib.rs index 2c4c7beb66..e0f4200c2b 100644 --- a/state-chain/pallets/cf-vaults/src/lib.rs +++ b/state-chain/pallets/cf-vaults/src/lib.rs @@ -339,12 +339,12 @@ pub mod pallet { } #[cfg(feature = "try-runtime")] - fn pre_upgrade() -> Result, &'static str> { + fn pre_upgrade() -> Result, DispatchError> { migrations::PalletMigration::::pre_upgrade() } #[cfg(feature = "try-runtime")] - fn post_upgrade(state: Vec) -> Result<(), &'static str> { + fn post_upgrade(state: Vec) -> Result<(), DispatchError> { migrations::PalletMigration::::post_upgrade(state) } } diff --git a/state-chain/pallets/cf-vaults/src/migrations/v2.rs b/state-chain/pallets/cf-vaults/src/migrations/v2.rs index 403c68aba4..b6e7acc7b7 100644 --- a/state-chain/pallets/cf-vaults/src/migrations/v2.rs +++ b/state-chain/pallets/cf-vaults/src/migrations/v2.rs @@ -34,13 +34,13 @@ impl, I: 'static> OnRuntimeUpgrade for Migration { #[cfg(feature = "try-runtime")] fn pre_upgrade() -> Result, DispatchError> { // just check that the old storage item existed - Ok(KeygenSlashRate::::exists().encode()) + Ok(old::KeygenSlashRate::::exists().encode()) } #[cfg(feature = "try-runtime")] fn post_upgrade(state: Vec) -> Result<(), DispatchError> { - if ::decode(&mut &_state[..]).map_err(|_| "Failed to decode pre-upgrade state.")? { - assert!(!KeygenSlashRate::::exist()); + if ::decode(&mut &state[..]).map_err(|_| "Failed to decode pre-upgrade state.")? { + assert!(!old::KeygenSlashRate::::exists()); assert!(KeygenSlashAmount::::exists()); assert!(KeygenSlashAmount::::get() == FLIPPERINOS_PER_FLIP) }