git.delta.rocks / unique-network / refs/commits / 716fee23155e

difftreelog

chore remove unique-scheduler leftovers

Yaroslav Bolyukin2023-10-04parent: #13e91d3.patch.diff
in: master

10 files changed

modifiedCargo.tomldiffbeforeafterboth
--- 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" }
modifiedMakefilediffbeforeafterboth
--- 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
modifiedruntime/common/config/pallets/mod.rsdiffbeforeafterboth
before · runtime/common/config/pallets/mod.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use alloc::string::{String, ToString};1819use frame_support::{20	parameter_types,21	traits::{ConstU32, ConstU64, Currency},22};23use sp_arithmetic::Perbill;24use sp_runtime::traits::AccountIdConversion;25use up_common::{26	constants::*,27	types::{AccountId, Balance, BlockNumber},28};29use up_data_structs::mapping::{CrossTokenAddressMapping, EvmTokenAddressMapping};3031#[cfg(feature = "governance")]32use crate::runtime_common::config::governance;33use crate::{34	runtime_common::{35		config::{ethereum::EvmCollectionHelpersAddress, substrate::TreasuryModuleId},36		dispatch::CollectionDispatchT,37		weights::CommonWeights,38		RelayChainBlockNumberProvider,39	},40	Balances, Runtime, RuntimeCall, RuntimeEvent, DECIMALS, TOKEN_SYMBOL, VERSION,41};4243#[cfg(feature = "unique-scheduler")]44pub mod scheduler;4546#[cfg(feature = "foreign-assets")]47pub mod foreign_asset;4849#[cfg(feature = "app-promotion")]50pub mod app_promotion;5152#[cfg(feature = "collator-selection")]53pub mod collator_selection;5455#[cfg(feature = "preimage")]56pub mod preimage;5758parameter_types! {59	pub const CollectionCreationPrice: Balance = 2 * UNIQUE;60	pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account_truncating();61}6263impl pallet_common::Config for Runtime {64	type WeightInfo = pallet_common::weights::SubstrateWeight<Self>;65	type RuntimeEvent = RuntimeEvent;66	type Currency = Balances;67	type CollectionCreationPrice = CollectionCreationPrice;68	type TreasuryAccountId = TreasuryAccountId;69	type CollectionDispatch = CollectionDispatchT<Self>;7071	type EvmTokenAddressMapping = EvmTokenAddressMapping;72	type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;73	type ContractAddress = EvmCollectionHelpersAddress;74}7576impl pallet_structure::Config for Runtime {77	type RuntimeEvent = RuntimeEvent;78	type RuntimeCall = RuntimeCall;79	type WeightInfo = pallet_structure::weights::SubstrateWeight<Self>;80}8182impl pallet_fungible::Config for Runtime {83	type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;84}85impl pallet_refungible::Config for Runtime {86	type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;87}88impl pallet_nonfungible::Config for Runtime {89	type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;90}9192parameter_types! {93	pub const Decimals: u8 = DECIMALS;94	pub Name: String = String::from_utf8_lossy(VERSION.impl_name.as_ref()).to_string();95	pub Symbol: String = TOKEN_SYMBOL.to_string();96}97impl pallet_balances_adapter::Config for Runtime {98	type Inspect = Balances;99	type Mutate = Balances;100	type CurrencyBalance = <Balances as Currency<Self::AccountId>>::Balance;101	type Decimals = Decimals;102	type Name = Name;103	type Symbol = Symbol;104	type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;105}106107parameter_types! {108	pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied109}110111/// Used for the pallet inflation112impl pallet_inflation::Config for Runtime {113	type Currency = Balances;114	type TreasuryAccountId = TreasuryAccountId;115	type InflationBlockInterval = InflationBlockInterval;116	type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;117}118119impl pallet_unique::Config for Runtime {120	type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;121	type CommonWeightInfo = CommonWeights<Self>;122	type RefungibleExtensionsWeightInfo = CommonWeights<Self>;123}124125parameter_types! {126	pub AppPromotionDailyRate: Perbill = Perbill::from_rational(5u32, 10_000);127	pub const MaxCollators: u32 = MAX_COLLATORS;128	pub const LicenseBond: Balance = GENESIS_LICENSE_BOND;129130	pub const DayRelayBlocks: BlockNumber = RELAY_DAYS;131}132133#[cfg(not(feature = "session-test-timings"))]134parameter_types! {135	pub const SessionPeriod: BlockNumber = SESSION_LENGTH;136}137138#[cfg(feature = "session-test-timings")]139parameter_types! {140	pub const SessionPeriod: BlockNumber = 5 * MINUTES;141}142143impl pallet_configuration::Config for Runtime {144	type RuntimeEvent = RuntimeEvent;145	type Balance = Balance;146	type DefaultWeightToFeeCoefficient = ConstU64<{ up_common::constants::WEIGHT_TO_FEE_COEFF }>;147	type DefaultMinGasPrice = ConstU64<{ up_common::constants::MIN_GAS_PRICE }>;148	type DefaultCollatorSelectionMaxCollators = MaxCollators;149	type DefaultCollatorSelectionKickThreshold = SessionPeriod;150	type DefaultCollatorSelectionLicenseBond = LicenseBond;151	type MaxXcmAllowedLocations = ConstU32<16>;152	type AppPromotionDailyRate = AppPromotionDailyRate;153	type DayRelayBlocks = DayRelayBlocks;154	type WeightInfo = pallet_configuration::weights::SubstrateWeight<Self>;155}156157impl pallet_maintenance::Config for Runtime {158	type RuntimeEvent = RuntimeEvent;159160	type RuntimeCall = RuntimeCall;161162	#[cfg(feature = "governance")]163	type ManagerOrigin = governance::RootOrTechnicalCommitteeMember;164165	#[cfg(not(feature = "governance"))]166	type ManagerOrigin = frame_system::EnsureRoot<AccountId>;167168	type PreimageOrigin = frame_system::EnsureRoot<AccountId>;169170	#[cfg(feature = "preimage")]171	type Preimages = crate::Preimage;172	#[cfg(not(feature = "preimage"))]173	type Preimages = ();174	type WeightInfo = pallet_maintenance::weights::SubstrateWeight<Self>;175}
after · runtime/common/config/pallets/mod.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use alloc::string::{String, ToString};1819use frame_support::{20	parameter_types,21	traits::{ConstU32, ConstU64, Currency},22};23use sp_arithmetic::Perbill;24use sp_runtime::traits::AccountIdConversion;25use up_common::{26	constants::*,27	types::{AccountId, Balance, BlockNumber},28};29use up_data_structs::mapping::{CrossTokenAddressMapping, EvmTokenAddressMapping};3031#[cfg(feature = "governance")]32use crate::runtime_common::config::governance;33use crate::{34	runtime_common::{35		config::{ethereum::EvmCollectionHelpersAddress, substrate::TreasuryModuleId},36		dispatch::CollectionDispatchT,37		weights::CommonWeights,38		RelayChainBlockNumberProvider,39	},40	Balances, Runtime, RuntimeCall, RuntimeEvent, DECIMALS, TOKEN_SYMBOL, VERSION,41};4243#[cfg(feature = "foreign-assets")]44pub mod foreign_asset;4546#[cfg(feature = "app-promotion")]47pub mod app_promotion;4849#[cfg(feature = "collator-selection")]50pub mod collator_selection;5152#[cfg(feature = "preimage")]53pub mod preimage;5455parameter_types! {56	pub const CollectionCreationPrice: Balance = 2 * UNIQUE;57	pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account_truncating();58}5960impl pallet_common::Config for Runtime {61	type WeightInfo = pallet_common::weights::SubstrateWeight<Self>;62	type RuntimeEvent = RuntimeEvent;63	type Currency = Balances;64	type CollectionCreationPrice = CollectionCreationPrice;65	type TreasuryAccountId = TreasuryAccountId;66	type CollectionDispatch = CollectionDispatchT<Self>;6768	type EvmTokenAddressMapping = EvmTokenAddressMapping;69	type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;70	type ContractAddress = EvmCollectionHelpersAddress;71}7273impl pallet_structure::Config for Runtime {74	type RuntimeEvent = RuntimeEvent;75	type RuntimeCall = RuntimeCall;76	type WeightInfo = pallet_structure::weights::SubstrateWeight<Self>;77}7879impl pallet_fungible::Config for Runtime {80	type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;81}82impl pallet_refungible::Config for Runtime {83	type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;84}85impl pallet_nonfungible::Config for Runtime {86	type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;87}8889parameter_types! {90	pub const Decimals: u8 = DECIMALS;91	pub Name: String = String::from_utf8_lossy(VERSION.impl_name.as_ref()).to_string();92	pub Symbol: String = TOKEN_SYMBOL.to_string();93}94impl pallet_balances_adapter::Config for Runtime {95	type Inspect = Balances;96	type Mutate = Balances;97	type CurrencyBalance = <Balances as Currency<Self::AccountId>>::Balance;98	type Decimals = Decimals;99	type Name = Name;100	type Symbol = Symbol;101	type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;102}103104parameter_types! {105	pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied106}107108/// Used for the pallet inflation109impl pallet_inflation::Config for Runtime {110	type Currency = Balances;111	type TreasuryAccountId = TreasuryAccountId;112	type InflationBlockInterval = InflationBlockInterval;113	type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;114}115116impl pallet_unique::Config for Runtime {117	type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;118	type CommonWeightInfo = CommonWeights<Self>;119	type RefungibleExtensionsWeightInfo = CommonWeights<Self>;120}121122parameter_types! {123	pub AppPromotionDailyRate: Perbill = Perbill::from_rational(5u32, 10_000);124	pub const MaxCollators: u32 = MAX_COLLATORS;125	pub const LicenseBond: Balance = GENESIS_LICENSE_BOND;126127	pub const DayRelayBlocks: BlockNumber = RELAY_DAYS;128}129130#[cfg(not(feature = "session-test-timings"))]131parameter_types! {132	pub const SessionPeriod: BlockNumber = SESSION_LENGTH;133}134135#[cfg(feature = "session-test-timings")]136parameter_types! {137	pub const SessionPeriod: BlockNumber = 5 * MINUTES;138}139140impl pallet_configuration::Config for Runtime {141	type RuntimeEvent = RuntimeEvent;142	type Balance = Balance;143	type DefaultWeightToFeeCoefficient = ConstU64<{ up_common::constants::WEIGHT_TO_FEE_COEFF }>;144	type DefaultMinGasPrice = ConstU64<{ up_common::constants::MIN_GAS_PRICE }>;145	type DefaultCollatorSelectionMaxCollators = MaxCollators;146	type DefaultCollatorSelectionKickThreshold = SessionPeriod;147	type DefaultCollatorSelectionLicenseBond = LicenseBond;148	type MaxXcmAllowedLocations = ConstU32<16>;149	type AppPromotionDailyRate = AppPromotionDailyRate;150	type DayRelayBlocks = DayRelayBlocks;151	type WeightInfo = pallet_configuration::weights::SubstrateWeight<Self>;152}153154impl pallet_maintenance::Config for Runtime {155	type RuntimeEvent = RuntimeEvent;156157	type RuntimeCall = RuntimeCall;158159	#[cfg(feature = "governance")]160	type ManagerOrigin = governance::RootOrTechnicalCommitteeMember;161162	#[cfg(not(feature = "governance"))]163	type ManagerOrigin = frame_system::EnsureRoot<AccountId>;164165	type PreimageOrigin = frame_system::EnsureRoot<AccountId>;166167	#[cfg(feature = "preimage")]168	type Preimages = crate::Preimage;169	#[cfg(not(feature = "preimage"))]170	type Preimages = ();171	type WeightInfo = pallet_maintenance::weights::SubstrateWeight<Self>;172}
deletedruntime/common/config/pallets/scheduler.rsdiffbeforeafterboth
--- 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 <http://www.gnu.org/licenses/>.
-
-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<u32> = Some(10);
-	pub const Preimage: Option<u32> = Some(10);
-}
-
-pub struct EnsureSignedOrRoot<AccountId>(sp_std::marker::PhantomData<AccountId>);
-impl<O: Into<Result<RawOrigin<AccountId>, O>> + From<RawOrigin<AccountId>>, AccountId: Decode>
-	EnsureOrigin<O> for EnsureSignedOrRoot<AccountId>
-{
-	type Success = ScheduledEnsureOriginSuccess<AccountId>;
-	fn try_origin(o: O) -> Result<Self::Success, O> {
-		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<OriginCaller> for EqualOrRootOnly {
-	fn cmp_privilege(left: &OriginCaller, right: &OriginCaller) -> Option<Ordering> {
-		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<AccountId>;
-	type OriginPrivilegeCmp = EqualOrRootOnly;
-	type MaxScheduledPerBlock = MaxScheduledPerBlock;
-	type WeightInfo = ();
-	type Preimages = ();
-	type CallExecutor = SchedulerPaymentExecutor;
-	type PrioritySetOrigin = EnsureRoot<AccountId>;
-}
modifiedruntime/common/maintenance.rsdiffbeforeafterboth
--- 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))
modifiedruntime/common/mod.rsdiffbeforeafterboth
--- 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;
modifiedruntime/common/runtime_apis.rsdiffbeforeafterboth
--- 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);
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -229,7 +229,6 @@
 preimage = []
 refungible = []
 session-test-timings = []
-unique-scheduler = []
 
 ################################################################################
 # local dependencies
modifiedruntime/quartz/Cargo.tomldiffbeforeafterboth
--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -221,7 +221,6 @@
 preimage = []
 refungible = []
 session-test-timings = []
-unique-scheduler = []
 
 ################################################################################
 # local dependencies
modifiedruntime/unique/Cargo.tomldiffbeforeafterboth
--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -224,7 +224,6 @@
 preimage = []
 refungible = []
 session-test-timings = []
-unique-scheduler = []
 
 ################################################################################
 # local dependencies