diff --git a/relay/paseo/src/lib.rs b/relay/paseo/src/lib.rs index 18a9acd..7e2ceb0 100644 --- a/relay/paseo/src/lib.rs +++ b/relay/paseo/src/lib.rs @@ -66,7 +66,7 @@ use frame_support::{ traits::{ fungible::HoldConsideration, tokens::UnityOrOuterConversion, ConstU32, ConstU8, EitherOf, EitherOfDiverse, Everything, FromContains, Get, InstanceFilter, KeyOwnerProofSystem, - LinearStoragePrice, OnRuntimeUpgrade, PrivilegeCmp, ProcessMessage, ProcessMessageError, + LinearStoragePrice, PrivilegeCmp, ProcessMessage, ProcessMessageError, WithdrawReasons, }, weights::{ @@ -1999,43 +1999,6 @@ pub mod migrations { } } - /// Cancel all ongoing auctions. - /// - /// Any leases that come into existence after coretime was launched will not be served. Yet, - /// any ongoing auctions must be cancelled. - /// - /// Safety: - /// - /// - After coretime is launched, there are no auctions anymore. So if this forgotten to - /// be removed after the runtime upgrade, running this again on the next one is harmless. - /// - I am assuming scheduler `TaskName`s are unique, so removal of the scheduled entry - /// multiple times should also be fine. - pub struct CancelAuctions; - impl OnRuntimeUpgrade for CancelAuctions { - fn on_runtime_upgrade() -> Weight { - if let Err(err) = Auctions::cancel_auction(frame_system::RawOrigin::Root.into()) { - log::debug!(target: "runtime", "Cancelling auctions failed: {:?}", err); - } - // Cancel scheduled auction as well: - if let Err(err) = Scheduler::cancel_named( - pallet_custom_origins::Origin::AuctionAdmin.into(), - [ - 0x87, 0xa8, 0x71, 0xb4, 0xd6, 0x21, 0xf0, 0xb9, 0x73, 0x47, 0x5a, 0xaf, 0xcc, - 0x32, 0x61, 0x0b, 0xd7, 0x68, 0x8f, 0x15, 0x02, 0x33, 0x8a, 0xcd, 0x00, 0xee, - 0x48, 0x8a, 0xc3, 0x62, 0x0f, 0x4c, - ], - ) { - log::debug!(target: "runtime", "Cancelling scheduled auctions failed: {:?}", err); - } - use pallet_scheduler::WeightInfo as _; - use polkadot_runtime_common::auctions::WeightInfo as _; - weights::polkadot_runtime_common_auctions::WeightInfo::::cancel_auction() - .saturating_add(weights::pallet_scheduler::WeightInfo::::cancel_named( - ::MaxScheduledPerBlock::get(), - )) - } - } - /// Unreleased migrations. Add new ones here: pub type Unreleased = ( parachains_configuration::migration::v12::MigrateToV12, @@ -2056,7 +2019,6 @@ pub mod migrations { crate::xcm_config::XcmRouter, GetLegacyLeaseImpl, >, - CancelAuctions, ); /// Migrations/checks that do not need to be versioned and can run on every update.