git.delta.rocks / unique-network / refs/commits / ac92a06719b5

difftreelog

fix scheduler v2 after rebase

Daniel Shiposha2022-10-24parent: #40ae5ae.patch.diff
in: master

4 files changed

modifiedpallets/scheduler-v2/Cargo.tomldiffbeforeafterboth
--- a/pallets/scheduler-v2/Cargo.toml
+++ b/pallets/scheduler-v2/Cargo.toml
@@ -13,18 +13,18 @@
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
-frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
-frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
-sp-io = { version = "6.0.0", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
-sp-runtime = { version = "6.0.0", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
-sp-std = { version = "4.0.0", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
-sp-core = { version = "6.0.0", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
+frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-io = { version = "6.0.0", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-runtime = { version = "6.0.0", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-std = { version = "4.0.0", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-core = { version = "6.0.0", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
 
 [dev-dependencies]
-pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
-sp-core = { version = "6.0.0", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
-substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
+pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-core = { version = "6.0.0", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
 
 [features]
 default = ["std"]
modifiedpallets/scheduler-v2/src/lib.rsdiffbeforeafterboth
--- a/pallets/scheduler-v2/src/lib.rs
+++ b/pallets/scheduler-v2/src/lib.rs
@@ -113,7 +113,7 @@
 }
 
 impl<T: Config> ScheduledCall<T> {
-	pub fn new(call: <T as Config>::Call) -> Result<Self, DispatchError> {
+	pub fn new(call: <T as Config>::RuntimeCall) -> Result<Self, DispatchError> {
 		let encoded = call.encode();
 		let len = encoded.len();
 
@@ -151,8 +151,8 @@
 		}
 	}
 
-	fn decode(mut data: &[u8]) -> Result<<T as Config>::Call, DispatchError> {
-		<T as Config>::Call::decode(&mut data)
+	fn decode(mut data: &[u8]) -> Result<<T as Config>::RuntimeCall, DispatchError> {
+		<T as Config>::RuntimeCall::decode(&mut data)
 			.map_err(|_| <Error<T>>::ScheduledCallCorrupted.into())
 	}
 }
@@ -162,14 +162,14 @@
 
 	fn peek(
 		call: &ScheduledCall<T>,
-	) -> Result<(<T as pallet::Config>::Call, Option<u32>), DispatchError>;
+	) -> Result<(<T as pallet::Config>::RuntimeCall, Option<u32>), DispatchError>;
 
 	/// Convert the given scheduled `call` value back into its original instance. If successful,
 	/// `drop` any data backing it. This will not break the realisability of independently
 	/// created instances of `ScheduledCall` which happen to have identical data.
 	fn realize(
 		call: &ScheduledCall<T>,
-	) -> Result<(<T as pallet::Config>::Call, Option<u32>), DispatchError>;
+	) -> Result<(<T as pallet::Config>::RuntimeCall, Option<u32>), DispatchError>;
 }
 
 impl<T: Config, PP: PreimageRecipient<T::Hash>> SchedulerPreimages<T> for PP {
@@ -182,7 +182,7 @@
 
 	fn peek(
 		call: &ScheduledCall<T>,
-	) -> Result<(<T as pallet::Config>::Call, Option<u32>), DispatchError> {
+	) -> Result<(<T as pallet::Config>::RuntimeCall, Option<u32>), DispatchError> {
 		match call {
 			ScheduledCall::Inline(data) => Ok((ScheduledCall::<T>::decode(data)?, None)),
 			ScheduledCall::PreimageLookup {
@@ -200,7 +200,7 @@
 
 	fn realize(
 		call: &ScheduledCall<T>,
-	) -> Result<(<T as pallet::Config>::Call, Option<u32>), DispatchError> {
+	) -> Result<(<T as pallet::Config>::RuntimeCall, Option<u32>), DispatchError> {
 		let r = Self::peek(call)?;
 		Self::drop(call);
 		Ok(r)
@@ -252,7 +252,7 @@
 impl WeightCounter {
 	fn check_accrue(&mut self, w: Weight) -> bool {
 		let test = self.used.saturating_add(w);
-		if test > self.limit {
+		if test.any_gt(self.limit) {
 			false
 		} else {
 			self.used = test;
@@ -261,7 +261,7 @@
 	}
 
 	fn can_accrue(&mut self, w: Weight) -> bool {
-		self.used.saturating_add(w) <= self.limit
+		self.used.saturating_add(w).all_lte(self.limit)
 	}
 }
 
@@ -300,12 +300,12 @@
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
+		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 
 		/// The aggregated origin which the dispatch will take.
-		type Origin: OriginTrait<PalletsOrigin = Self::PalletsOrigin>
+		type RuntimeOrigin: OriginTrait<PalletsOrigin = Self::PalletsOrigin>
 			+ From<Self::PalletsOrigin>
-			+ IsType<<Self as system::Config>::Origin>
+			+ IsType<<Self as system::Config>::RuntimeOrigin>
 			+ Clone;
 
 		/// The caller origin, overarching type of all pallets origins.
@@ -317,9 +317,9 @@
 			+ MaxEncodedLen;
 
 		/// The aggregated call type.
-		type Call: Parameter
-			+ Dispatchable<Origin = <Self as Config>::Origin, PostInfo = PostDispatchInfo>
-			+ UnfilteredDispatchable<Origin = <Self as system::Config>::Origin>
+		type RuntimeCall: Parameter
+			+ Dispatchable<RuntimeOrigin = <Self as Config>::RuntimeOrigin, PostInfo = PostDispatchInfo>
+			+ UnfilteredDispatchable<RuntimeOrigin = <Self as system::Config>::RuntimeOrigin>
 			+ GetDispatchInfo
 			+ From<system::Call<Self>>;
 
@@ -329,7 +329,7 @@
 
 		/// Required origin to schedule or cancel calls.
 		type ScheduleOrigin: EnsureOrigin<
-			<Self as system::Config>::Origin,
+			<Self as system::Config>::RuntimeOrigin,
 			Success = ScheduledEnsureOriginSuccess<Self::AccountId>,
 		>;
 
@@ -356,7 +356,7 @@
 		type CallExecutor: DispatchCall<Self, H160>;
 
 		/// Required origin to set/change calls' priority.
-		type PrioritySetOrigin: EnsureOrigin<<Self as system::Config>::Origin>;
+		type PrioritySetOrigin: EnsureOrigin<<Self as system::Config>::RuntimeOrigin>;
 	}
 
 	#[pallet::storage]
@@ -458,7 +458,7 @@
 			when: T::BlockNumber,
 			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 			priority: Option<schedule::Priority>,
-			call: Box<<T as Config>::Call>,
+			call: Box<<T as Config>::RuntimeCall>,
 		) -> DispatchResult {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
 
@@ -466,7 +466,7 @@
 				T::PrioritySetOrigin::ensure_origin(origin.clone())?;
 			}
 
-			let origin = <T as Config>::Origin::from(origin);
+			let origin = <T as Config>::RuntimeOrigin::from(origin);
 			Self::do_schedule(
 				DispatchTime::At(when),
 				maybe_periodic,
@@ -481,7 +481,7 @@
 		#[pallet::weight(<T as Config>::WeightInfo::cancel(T::MaxScheduledPerBlock::get()))]
 		pub fn cancel(origin: OriginFor<T>, when: T::BlockNumber, index: u32) -> DispatchResult {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
-			let origin = <T as Config>::Origin::from(origin);
+			let origin = <T as Config>::RuntimeOrigin::from(origin);
 			Self::do_cancel(Some(origin.caller().clone()), (when, index))?;
 			Ok(())
 		}
@@ -494,7 +494,7 @@
 			when: T::BlockNumber,
 			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 			priority: Option<schedule::Priority>,
-			call: Box<<T as Config>::Call>,
+			call: Box<<T as Config>::RuntimeCall>,
 		) -> DispatchResult {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
 
@@ -502,7 +502,7 @@
 				T::PrioritySetOrigin::ensure_origin(origin.clone())?;
 			}
 
-			let origin = <T as Config>::Origin::from(origin);
+			let origin = <T as Config>::RuntimeOrigin::from(origin);
 			Self::do_schedule_named(
 				id,
 				DispatchTime::At(when),
@@ -518,7 +518,7 @@
 		#[pallet::weight(<T as Config>::WeightInfo::cancel_named(T::MaxScheduledPerBlock::get()))]
 		pub fn cancel_named(origin: OriginFor<T>, id: TaskName) -> DispatchResult {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
-			let origin = <T as Config>::Origin::from(origin);
+			let origin = <T as Config>::RuntimeOrigin::from(origin);
 			Self::do_cancel_named(Some(origin.caller().clone()), id)?;
 			Ok(())
 		}
@@ -534,7 +534,7 @@
 			after: T::BlockNumber,
 			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 			priority: Option<schedule::Priority>,
-			call: Box<<T as Config>::Call>,
+			call: Box<<T as Config>::RuntimeCall>,
 		) -> DispatchResult {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
 
@@ -542,7 +542,7 @@
 				T::PrioritySetOrigin::ensure_origin(origin.clone())?;
 			}
 
-			let origin = <T as Config>::Origin::from(origin);
+			let origin = <T as Config>::RuntimeOrigin::from(origin);
 			Self::do_schedule(
 				DispatchTime::After(after),
 				maybe_periodic,
@@ -565,7 +565,7 @@
 			after: T::BlockNumber,
 			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 			priority: Option<schedule::Priority>,
-			call: Box<<T as Config>::Call>,
+			call: Box<<T as Config>::RuntimeCall>,
 		) -> DispatchResult {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
 
@@ -573,7 +573,7 @@
 				T::PrioritySetOrigin::ensure_origin(origin.clone())?;
 			}
 
-			let origin = <T as Config>::Origin::from(origin);
+			let origin = <T as Config>::RuntimeOrigin::from(origin);
 			Self::do_schedule_named(
 				id,
 				DispatchTime::After(after),
@@ -592,7 +592,7 @@
 			priority: schedule::Priority,
 		) -> DispatchResult {
 			T::PrioritySetOrigin::ensure_origin(origin.clone())?;
-			let origin = <T as Config>::Origin::from(origin);
+			let origin = <T as Config>::RuntimeOrigin::from(origin);
 			Self::do_change_named_priority(origin.caller().clone(), id, priority)
 		}
 	}
@@ -816,7 +816,7 @@
 	/// Resolve the call dispatch, including any post-dispatch operations.
 	fn dispatch_call(
 		signer: Option<T::AccountId>,
-		function: <T as Config>::Call,
+		function: <T as Config>::RuntimeCall,
 	) -> Result<
 		Result<PostDispatchInfo, DispatchErrorWithPostInfo<PostDispatchInfo>>,
 		TransactionValidityError,
@@ -1036,9 +1036,9 @@
 	fn execute_dispatch(
 		weight: &mut WeightCounter,
 		origin: T::PalletsOrigin,
-		call: <T as Config>::Call,
+		call: <T as Config>::RuntimeCall,
 	) -> Result<DispatchResult, ServiceTaskError> {
-		let dispatch_origin: <T as Config>::Origin = origin.into();
+		let dispatch_origin: <T as Config>::RuntimeOrigin = origin.into();
 		let base_weight = match dispatch_origin.clone().as_signed() {
 			Some(_) => T::WeightInfo::execute_dispatch_signed(),
 			_ => T::WeightInfo::execute_dispatch_unsigned(),
modifiedruntime/common/config/pallets/scheduler.rsdiffbeforeafterboth
--- a/runtime/common/config/pallets/scheduler.rs
+++ b/runtime/common/config/pallets/scheduler.rs
@@ -88,10 +88,10 @@
 // }
 
 impl pallet_unique_scheduler_v2::Config for Runtime {
-	type Event = Event;
-	type Origin = Origin;
+	type RuntimeEvent = RuntimeEvent;
+	type RuntimeOrigin = RuntimeOrigin;
 	type PalletsOrigin = OriginCaller;
-	type Call = Call;
+	type RuntimeCall = RuntimeCall;
 	type MaximumWeight = MaximumSchedulerWeight;
 	type ScheduleOrigin = EnsureSignedOrRoot<AccountId>;
 	type OriginPrivilegeCmp = EqualOrRootOnly;
modifiedtest-pallets/utils/src/lib.rsdiffbeforeafterboth
before · test-pallets/utils/src/lib.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/>.1617#![cfg_attr(not(feature = "std"), no_std)]1819pub use pallet::*;20use frame_support::pallet_prelude::*;21use frame_system::pallet_prelude::*;2223#[frame_support::pallet]24pub mod pallet {25	use frame_support::pallet_prelude::*;26	use frame_system::pallet_prelude::*;27	use pallet_unique_scheduler_v2::{TaskName, Pallet as SchedulerPallet};2829	#[pallet::config]30	pub trait Config: frame_system::Config + pallet_unique_scheduler::Config {31		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;32	}3334	#[pallet::event]35	#[pallet::generate_deposit(pub(super) fn deposit_event)]36	pub enum Event<T: Config> {37		ValueIsSet,38		ShouldRollback,39	}4041	#[pallet::pallet]42	#[pallet::generate_store(pub(super) trait Store)]43	pub struct Pallet<T>(_);4445	#[pallet::storage]46	#[pallet::getter(fn is_enabled)]47	pub type Enabled<T> = StorageValue<_, bool, ValueQuery>;4849	#[pallet::storage]50	#[pallet::getter(fn test_value)]51	pub type TestValue<T> = StorageValue<_, u32, ValueQuery>;5253	#[pallet::error]54	pub enum Error<T> {55		TestPalletDisabled,56		TriggerRollback,57	}5859	#[pallet::call]60	impl<T: Config> Pallet<T> {61		#[pallet::weight(10_000)]62		pub fn enable(origin: OriginFor<T>) -> DispatchResult {63			ensure_root(origin)?;64			<Enabled<T>>::set(true);6566			Ok(())67		}6869		#[pallet::weight(10_000)]70		pub fn set_test_value(origin: OriginFor<T>, value: u32) -> DispatchResult {71			Self::ensure_origin_and_enabled(origin)?;7273			<TestValue<T>>::put(value);7475			Self::deposit_event(Event::ValueIsSet);7677			Ok(())78		}7980		#[pallet::weight(10_000)]81		pub fn set_test_value_and_rollback(origin: OriginFor<T>, value: u32) -> DispatchResult {82			Self::set_test_value(origin, value)?;8384			Self::deposit_event(Event::ShouldRollback);8586			Err(<Error<T>>::TriggerRollback.into())87		}8889		#[pallet::weight(10_000)]90		pub fn inc_test_value(origin: OriginFor<T>) -> DispatchResult {91			Self::set_test_value(origin, <TestValue<T>>::get() + 1)92		}9394		#[pallet::weight(10_000)]95		pub fn self_canceling_inc(96			origin: OriginFor<T>,97			id: TaskName,98			max_test_value: u32,99		) -> DispatchResult {100			Self::ensure_origin_and_enabled(origin.clone())?;101			Self::inc_test_value(origin.clone())?;102103			if <TestValue<T>>::get() == max_test_value {104				SchedulerPallet::<T>::cancel_named(origin, id)?;105			}106107			Ok(())108		}109110		#[pallet::weight(100_000_000)]111		pub fn just_take_fee(origin: OriginFor<T>) -> DispatchResult {112			Self::ensure_origin_and_enabled(origin)?;113			Ok(())114		}115	}116}117118impl<T: Config> Pallet<T> {119	fn ensure_origin_and_enabled(origin: OriginFor<T>) -> DispatchResult {120		ensure_signed(origin)?;121		<Enabled<T>>::get()122			.then(|| ())123			.ok_or(<Error<T>>::TestPalletDisabled.into())124	}125}