--- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,5 @@ [workspace] default-members = ['client/*', 'node/*', 'runtime/opal'] -exclude = ['pallets/scheduler-v2'] members = [ 'client/*', 'crates/*', @@ -54,7 +53,6 @@ pallet-structure = { default-features = false, path = "pallets/structure" } pallet-test-utils = { default-features = false, path = "test-pallets/utils" } pallet-unique = { path = "pallets/unique", default-features = false } -# pallet-unique-scheduler-v2 = { path = "pallets/scheduler-v2", default-features = false } precompile-utils-macro = { path = "runtime/common/ethereum/precompiles/utils/macro" } struct-versioning = { path = "crates/struct-versioning" } uc-rpc = { path = "client/rpc" } --- a/Makefile +++ b/Makefile @@ -128,10 +128,6 @@ bench-structure: make _bench PALLET=structure -.PHONY: bench-scheduler -bench-scheduler: - make _bench PALLET=unique-scheduler-v2 PALLET_DIR=scheduler-v2 - .PHONY: bench-foreign-assets bench-foreign-assets: make _bench PALLET=foreign-assets @@ -157,7 +153,6 @@ make _bench PALLET=xcm OUTPUT=./runtime/common/weights/xcm.rs TEMPLATE="--template=.maintain/external-weight-template.hbs" .PHONY: bench -# Disabled: bench-scheduler bench: bench-app-promotion bench-common bench-evm-migration bench-unique bench-structure bench-fungible bench-refungible bench-nonfungible bench-configuration bench-foreign-assets bench-maintenance bench-xcm bench-collator-selection bench-identity .PHONY: check --- a/runtime/common/config/pallets/mod.rs +++ b/runtime/common/config/pallets/mod.rs @@ -40,9 +40,6 @@ Balances, Runtime, RuntimeCall, RuntimeEvent, DECIMALS, TOKEN_SYMBOL, VERSION, }; -#[cfg(feature = "unique-scheduler")] -pub mod scheduler; - #[cfg(feature = "foreign-assets")] pub mod foreign_asset; --- a/runtime/common/config/pallets/scheduler.rs +++ /dev/null @@ -1,88 +0,0 @@ -// Copyright 2019-2022 Unique Network (Gibraltar) Ltd. -// This file is part of Unique Network. - -// Unique Network is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Unique Network is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Unique Network. If not, see . - -use core::cmp::Ordering; - -use frame_support::{ - parameter_types, - traits::{EnsureOrigin, PrivilegeCmp}, - weights::Weight, -}; -use frame_system::{EnsureRoot, RawOrigin}; -use pallet_unique_scheduler_v2::ScheduledEnsureOriginSuccess; -use parity_scale_codec::Decode; -use sp_runtime::Perbill; -use up_common::types::AccountId; - -use crate::{ - runtime_common::{config::substrate::RuntimeBlockWeights, scheduler::SchedulerPaymentExecutor}, - OriginCaller, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, -}; - -parameter_types! { - pub MaximumSchedulerWeight: Weight = Perbill::from_percent(50) * - RuntimeBlockWeights::get().max_block; - pub const MaxScheduledPerBlock: u32 = 50; - - pub const NoPreimagePostponement: Option = Some(10); - pub const Preimage: Option = Some(10); -} - -pub struct EnsureSignedOrRoot(sp_std::marker::PhantomData); -impl, O>> + From>, AccountId: Decode> - EnsureOrigin for EnsureSignedOrRoot -{ - type Success = ScheduledEnsureOriginSuccess; - fn try_origin(o: O) -> Result { - o.into().and_then(|o| match o { - RawOrigin::Root => Ok(ScheduledEnsureOriginSuccess::Root), - RawOrigin::Signed(who) => Ok(ScheduledEnsureOriginSuccess::Signed(who)), - r => Err(O::from(r)), - }) - } -} - -pub struct EqualOrRootOnly; -impl PrivilegeCmp for EqualOrRootOnly { - fn cmp_privilege(left: &OriginCaller, right: &OriginCaller) -> Option { - use RawOrigin::*; - - let left = left.clone().try_into().ok()?; - let right = right.clone().try_into().ok()?; - - match (left, right) { - (Root, Root) => Some(Ordering::Equal), - (Root, _) => Some(Ordering::Greater), - (_, Root) => Some(Ordering::Less), - lr @ _ => (lr.0 == lr.1).then(|| Ordering::Equal), - } - } -} - -impl pallet_unique_scheduler_v2::Config for Runtime { - type RuntimeEvent = RuntimeEvent; - type RuntimeOrigin = RuntimeOrigin; - type PalletsOrigin = OriginCaller; - type RuntimeCall = RuntimeCall; - type MaximumWeight = MaximumSchedulerWeight; - type ScheduleOrigin = EnsureSignedOrRoot; - type OriginPrivilegeCmp = EqualOrRootOnly; - type MaxScheduledPerBlock = MaxScheduledPerBlock; - type WeightInfo = (); - type Preimages = (); - type CallExecutor = SchedulerPaymentExecutor; - type PrioritySetOrigin = EnsureRoot; -} --- a/runtime/common/maintenance.rs +++ b/runtime/common/maintenance.rs @@ -67,9 +67,6 @@ | RuntimeCall::Structure(_) | RuntimeCall::Unique(_) => Err(TransactionValidityError::Invalid(InvalidTransaction::Call)), - #[cfg(feature = "unique-scheduler")] - RuntimeCall::Scheduler(_) => Err(TransactionValidityError::Invalid(InvalidTransaction::Call)), - #[cfg(feature = "app-promotion")] RuntimeCall::AppPromotion(_) => { Err(TransactionValidityError::Invalid(InvalidTransaction::Call)) --- a/runtime/common/mod.rs +++ b/runtime/common/mod.rs @@ -23,9 +23,6 @@ pub mod maintenance; pub mod runtime_apis; -#[cfg(feature = "unique-scheduler")] -pub mod scheduler; - pub mod sponsoring; #[allow(missing_docs)] pub mod weights; --- a/runtime/common/runtime_apis.rs +++ b/runtime/common/runtime_apis.rs @@ -548,9 +548,6 @@ #[cfg(feature = "refungible")] list_benchmark!(list, extra, pallet_refungible, Refungible); - #[cfg(feature = "unique-scheduler")] - list_benchmark!(list, extra, pallet_unique_scheduler_v2, Scheduler); - #[cfg(feature = "collator-selection")] list_benchmark!(list, extra, pallet_collator_selection, CollatorSelection); @@ -613,9 +610,6 @@ #[cfg(feature = "refungible")] add_benchmark!(params, batches, pallet_refungible, Refungible); - - #[cfg(feature = "unique-scheduler")] - add_benchmark!(params, batches, pallet_unique_scheduler_v2, Scheduler); #[cfg(feature = "collator-selection")] add_benchmark!(params, batches, pallet_collator_selection, CollatorSelection); --- a/runtime/opal/Cargo.toml +++ b/runtime/opal/Cargo.toml @@ -229,7 +229,6 @@ preimage = [] refungible = [] session-test-timings = [] -unique-scheduler = [] ################################################################################ # local dependencies --- a/runtime/quartz/Cargo.toml +++ b/runtime/quartz/Cargo.toml @@ -221,7 +221,6 @@ preimage = [] refungible = [] session-test-timings = [] -unique-scheduler = [] ################################################################################ # local dependencies --- a/runtime/unique/Cargo.toml +++ b/runtime/unique/Cargo.toml @@ -224,7 +224,6 @@ preimage = [] refungible = [] session-test-timings = [] -unique-scheduler = [] ################################################################################ # local dependencies