diff --git a/frame/democracy/src/migrations/unlock_and_unreserve_all_funds.rs b/frame/democracy/src/migrations/unlock_and_unreserve_all_funds.rs index e23a7c4f5f74c..1f46070d1d7fc 100644 --- a/frame/democracy/src/migrations/unlock_and_unreserve_all_funds.rs +++ b/frame/democracy/src/migrations/unlock_and_unreserve_all_funds.rs @@ -150,8 +150,17 @@ where log::info!(target: LOG_TARGET, "Total accounts: {:?}", all_accounts.len()); log::info!(target: LOG_TARGET, "Total stake to unlock: {:?}", total_stake_to_unlock); - log::info!(target: LOG_TARGET, "Total deposit to unreserve: {:?}", total_deposits_to_unreserve); - log::info!(target: LOG_TARGET, "Bugged deposits: {}/{}", bugged_deposits, account_deposits.len()); + log::info!( + target: LOG_TARGET, + "Total deposit to unreserve: {:?}", + total_deposits_to_unreserve + ); + log::info!( + target: LOG_TARGET, + "Bugged deposits: {}/{}", + bugged_deposits, + account_deposits.len() + ); Ok(account_reserved_before.encode()) } diff --git a/frame/elections-phragmen/src/migrations/unlock_and_unreserve_all_funds.rs b/frame/elections-phragmen/src/migrations/unlock_and_unreserve_all_funds.rs index 0115e4148d7bb..f566f84e51a2b 100644 --- a/frame/elections-phragmen/src/migrations/unlock_and_unreserve_all_funds.rs +++ b/frame/elections-phragmen/src/migrations/unlock_and_unreserve_all_funds.rs @@ -165,11 +165,20 @@ where let total_stake_to_unlock = account_staked_sums.clone().into_values().sum::>(); let total_deposits_to_unreserve = account_deposited_sums.clone().into_values().sum::>(); - log::info!(target: LOG_TARGET, "Total accounts: {:?}", all_accounts.len()); + log::info!(target: LOG_TARGET, "Total accounts: {:?}", all_accounts.len()); log::info!(target: LOG_TARGET, "Total stake to unlock: {:?}", total_stake_to_unlock); - log::info!(target: LOG_TARGET, "Total deposit to unreserve: {:?}", total_deposits_to_unreserve); + log::info!( + target: LOG_TARGET, + "Total deposit to unreserve: {:?}", + total_deposits_to_unreserve + ); if bugged_deposits > 0 { - log::warn!(target: LOG_TARGET, "Bugged deposits: {}/{}", bugged_deposits, all_accounts.len()); + log::warn!( + target: LOG_TARGET, + "Bugged deposits: {}/{}", + bugged_deposits, + all_accounts.len() + ); } Ok(account_reserved_before.encode()) diff --git a/frame/im-online/src/migration.rs b/frame/im-online/src/migration.rs index 33a9bd1479d04..49c990332dac6 100644 --- a/frame/im-online/src/migration.rs +++ b/frame/im-online/src/migration.rs @@ -61,8 +61,6 @@ pub mod v1 { impl OnRuntimeUpgrade for Migration { #[cfg(feature = "try-runtime")] fn pre_upgrade() -> Result, TryRuntimeError> { - ensure!(StorageVersion::get::>() == 0, "can only upgrade from version 0"); - let count = v0::ReceivedHeartbeats::::iter().count(); log::info!(target: TARGET, "Migrating {} received heartbeats", count); @@ -111,7 +109,7 @@ pub mod v1 { old_received_heartbeats ); } - ensure!(StorageVersion::get::>() == 1, "must upgrade"); + ensure!(StorageVersion::get::>() >= 1, "must upgrade"); Ok(()) }