difftreelog
Missed tests was added. Scheduler pallet renamed.
in: master
13 files changed
Makefilediffbeforeafterboth--- a/Makefile
+++ b/Makefile
@@ -103,7 +103,7 @@
.PHONY: bench-scheduler
bench-scheduler:
- make _bench2 PALLET=unq-scheduler PALLET_DIR=scheduler
+ make _bench2 PALLET=unique-scheduler PALLET_DIR=scheduler
.PHONY: bench
bench: bench-evm-migration bench-unique bench-structure bench-fungible bench-refungible bench-nonfungible bench-scheduler
pallets/scheduler/Cargo.tomldiffbeforeafterboth--- a/pallets/scheduler/Cargo.toml
+++ b/pallets/scheduler/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "pallet-unq-scheduler"
+name = "pallet-unique-scheduler"
version = "0.1.0"
authors = ["Unique Network <support@uniquenetwork.io>"]
edition = "2021"
pallets/scheduler/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/scheduler/src/benchmarking.rs
+++ b/pallets/scheduler/src/benchmarking.rs
@@ -123,6 +123,18 @@
assert!(Agenda::<T>::iter().count() == 0);
}
+ on_initialize_periodic {
+ let s in 1 .. T::MaxScheduledPerBlock::get();
+ let when = BLOCK_NUMBER.into();
+ fill_schedule::<T>(when, s, true, Some(false))?;
+ }: { Scheduler::<T>::on_initialize(when); }
+ verify {
+ assert_eq!(System::<T>::event_count(), s);
+ for i in 0..s {
+ assert_eq!(Agenda::<T>::get(when + (i + 100).into()).len(), 1 as usize);
+ }
+ }
+
on_initialize_periodic_resolved {
let s in 1 .. T::MaxScheduledPerBlock::get();
let when = BLOCK_NUMBER.into();
@@ -135,6 +147,42 @@
}
}
+ on_initialize_aborted {
+ let s in 1 .. T::MaxScheduledPerBlock::get();
+ let when = BLOCK_NUMBER.into();
+ fill_schedule::<T>(when, s, false, None)?;
+ }: { Scheduler::<T>::on_initialize(BLOCK_NUMBER.into()); }
+ verify {
+ assert_eq!(System::<T>::event_count(), 0);
+ }
+
+ on_initialize_named_aborted {
+ let s in 1 .. T::MaxScheduledPerBlock::get();
+ let when = BLOCK_NUMBER.into();
+ fill_schedule::<T>(when, s, false, Some(false))?;
+ }: { Scheduler::<T>::on_initialize(BLOCK_NUMBER.into()); }
+ verify {
+ }
+
+ on_initialize_named {
+ let s in 1 .. T::MaxScheduledPerBlock::get();
+ let when = BLOCK_NUMBER.into();
+ fill_schedule::<T>(when, s, false, None)?;
+ }: { Scheduler::<T>::on_initialize(BLOCK_NUMBER.into()); }
+ verify {
+ assert_eq!(System::<T>::event_count(), 0);
+ }
+
+ on_initialize {
+ let s in 1 .. T::MaxScheduledPerBlock::get();
+ let when = BLOCK_NUMBER.into();
+ fill_schedule::<T>(when, s, false, Some(false))?;
+ }: { Scheduler::<T>::on_initialize(BLOCK_NUMBER.into()); }
+ verify {
+ assert_eq!(System::<T>::event_count(), s);
+ assert!(Agenda::<T>::iter().count() == 0);
+ }
+
on_initialize_resolved {
let s in 1 .. T::MaxScheduledPerBlock::get();
let when = BLOCK_NUMBER.into();
pallets/scheduler/src/lib.rsdiffbeforeafterboth--- a/pallets/scheduler/src/lib.rs
+++ b/pallets/scheduler/src/lib.rs
@@ -158,11 +158,10 @@
Self::on_initialize_periodic(2) - Self::on_initialize_periodic(1)
}
(true, true, Some(false)) => {
- Self::on_initialize_periodic_named(2) - Self::on_initialize_periodic_named(1)
- }
- (false, false, Some(true)) => {
- Self::on_initialize_resolved(2) - Self::on_initialize_resolved(1)
+ Self::on_initialize_periodic_named_resolved(2)
+ - Self::on_initialize_periodic_named_resolved(1)
}
+ (false, false, Some(true)) => Self::on_initialize(2) - Self::on_initialize(1),
(false, true, Some(true)) => {
Self::on_initialize_named_resolved(2) - Self::on_initialize_named_resolved(1)
}
pallets/scheduler/src/weights.rsdiffbeforeafterboth1// Template adopted from https://github.com/paritytech/substrate/blob/master/.maintain/frame-weight-template.hbs23//! Autogenerated weights for pallet_unq_scheduler4//!5//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev6//! DATE: 2022-06-09, STEPS: `50`, REPEAT: 200, LOW RANGE: `[]`, HIGH RANGE: `[]`7//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 102489// Executed Command:10// target/release/unique-collator11// benchmark12// pallet13// --pallet14// pallet-unq-scheduler15// --wasm-execution16// compiled17// --extrinsic18// *19// --template20// .maintain/frame-weight-template.hbs21// --steps=5022// --repeat=20023// --heap-pages=409624// --output=./pallets/scheduler/src/weights.rs2526#![cfg_attr(rustfmt, rustfmt_skip)]27#![allow(unused_parens)]28#![allow(unused_imports)]29#![allow(clippy::unnecessary_cast)]3031use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};32use sp_std::marker::PhantomData;3334/// Weight functions needed for pallet_unq_scheduler.35pub trait WeightInfo {36 fn on_initialize_periodic_named_resolved(s: u32, ) -> Weight;37 fn on_initialize_named_resolved(s: u32, ) -> Weight;38 fn on_initialize_periodic_resolved(s: u32, ) -> Weight;39 fn on_initialize_resolved(s: u32, ) -> Weight;40 fn schedule_named(s: u32, ) -> Weight;41 fn cancel_named(s: u32, ) -> Weight;42}4344/// Weights for pallet_unq_scheduler using the Substrate node and recommended hardware.45pub struct SubstrateWeight<T>(PhantomData<T>);46impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {47 // Storage: Scheduler Agenda (r:2 w:2)48 // Storage: System Account (r:1 w:1)49 // Storage: System AllExtrinsicsLen (r:1 w:1)50 // Storage: System BlockWeight (r:1 w:1)51 // Storage: Scheduler Lookup (r:0 w:1)52 fn on_initialize_periodic_named_resolved(s: u32, ) -> Weight {53 (39_822_000 as Weight)54 // Standard Error: 4_00055 .saturating_add((31_823_000 as Weight).saturating_mul(s as Weight))56 .saturating_add(T::DbWeight::get().reads(4 as Weight))57 .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))58 .saturating_add(T::DbWeight::get().writes(4 as Weight))59 .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(s as Weight)))60 }61 // Storage: Scheduler Agenda (r:1 w:1)62 // Storage: System Account (r:1 w:1)63 // Storage: System AllExtrinsicsLen (r:1 w:1)64 // Storage: System BlockWeight (r:1 w:1)65 // Storage: Scheduler Lookup (r:0 w:1)66 fn on_initialize_named_resolved(s: u32, ) -> Weight {67 (36_019_000 as Weight)68 // Standard Error: 3_00069 .saturating_add((22_660_000 as Weight).saturating_mul(s as Weight))70 .saturating_add(T::DbWeight::get().reads(4 as Weight))71 .saturating_add(T::DbWeight::get().writes(4 as Weight))72 .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))73 }74 // Storage: Scheduler Agenda (r:2 w:2)75 // Storage: System Account (r:1 w:1)76 // Storage: System AllExtrinsicsLen (r:1 w:1)77 // Storage: System BlockWeight (r:1 w:1)78 // Storage: Scheduler Lookup (r:0 w:1)79 fn on_initialize_periodic_resolved(s: u32, ) -> Weight {80 (36_613_000 as Weight)81 // Standard Error: 3_00082 .saturating_add((31_895_000 as Weight).saturating_mul(s as Weight))83 .saturating_add(T::DbWeight::get().reads(4 as Weight))84 .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))85 .saturating_add(T::DbWeight::get().writes(4 as Weight))86 .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(s as Weight)))87 }88 // Storage: Scheduler Agenda (r:1 w:1)89 // Storage: System Account (r:1 w:1)90 // Storage: System AllExtrinsicsLen (r:1 w:1)91 // Storage: System BlockWeight (r:1 w:1)92 // Storage: Scheduler Lookup (r:0 w:1)93 fn on_initialize_resolved(s: u32, ) -> Weight {94 (36_252_000 as Weight)95 // Standard Error: 3_00096 .saturating_add((22_662_000 as Weight).saturating_mul(s as Weight))97 .saturating_add(T::DbWeight::get().reads(4 as Weight))98 .saturating_add(T::DbWeight::get().writes(4 as Weight))99 .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))100 }101 // Storage: Scheduler Lookup (r:1 w:1)102 // Storage: Scheduler Agenda (r:1 w:1)103 fn schedule_named(s: u32, ) -> Weight {104 (34_561_000 as Weight)105 // Standard Error: 0106 .saturating_add((161_000 as Weight).saturating_mul(s as Weight))107 .saturating_add(T::DbWeight::get().reads(2 as Weight))108 .saturating_add(T::DbWeight::get().writes(2 as Weight))109 }110 // Storage: Scheduler Lookup (r:1 w:1)111 // Storage: Scheduler Agenda (r:1 w:1)112 fn cancel_named(s: u32, ) -> Weight {113 (30_932_000 as Weight)114 // Standard Error: 1_000115 .saturating_add((1_537_000 as Weight).saturating_mul(s as Weight))116 .saturating_add(T::DbWeight::get().reads(2 as Weight))117 .saturating_add(T::DbWeight::get().writes(2 as Weight))118 }119}120121// For backwards compatibility and tests122impl WeightInfo for () {123 // Storage: Scheduler Agenda (r:2 w:2)124 // Storage: System Account (r:1 w:1)125 // Storage: System AllExtrinsicsLen (r:1 w:1)126 // Storage: System BlockWeight (r:1 w:1)127 // Storage: Scheduler Lookup (r:0 w:1)128 fn on_initialize_periodic_named_resolved(s: u32, ) -> Weight {129 (39_822_000 as Weight)130 // Standard Error: 4_000131 .saturating_add((31_823_000 as Weight).saturating_mul(s as Weight))132 .saturating_add(RocksDbWeight::get().reads(4 as Weight))133 .saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))134 .saturating_add(RocksDbWeight::get().writes(4 as Weight))135 .saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(s as Weight)))136 }137 // Storage: Scheduler Agenda (r:1 w:1)138 // Storage: System Account (r:1 w:1)139 // Storage: System AllExtrinsicsLen (r:1 w:1)140 // Storage: System BlockWeight (r:1 w:1)141 // Storage: Scheduler Lookup (r:0 w:1)142 fn on_initialize_named_resolved(s: u32, ) -> Weight {143 (36_019_000 as Weight)144 // Standard Error: 3_000145 .saturating_add((22_660_000 as Weight).saturating_mul(s as Weight))146 .saturating_add(RocksDbWeight::get().reads(4 as Weight))147 .saturating_add(RocksDbWeight::get().writes(4 as Weight))148 .saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))149 }150 // Storage: Scheduler Agenda (r:2 w:2)151 // Storage: System Account (r:1 w:1)152 // Storage: System AllExtrinsicsLen (r:1 w:1)153 // Storage: System BlockWeight (r:1 w:1)154 // Storage: Scheduler Lookup (r:0 w:1)155 fn on_initialize_periodic_resolved(s: u32, ) -> Weight {156 (36_613_000 as Weight)157 // Standard Error: 3_000158 .saturating_add((31_895_000 as Weight).saturating_mul(s as Weight))159 .saturating_add(RocksDbWeight::get().reads(4 as Weight))160 .saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))161 .saturating_add(RocksDbWeight::get().writes(4 as Weight))162 .saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(s as Weight)))163 }164 // Storage: Scheduler Agenda (r:1 w:1)165 // Storage: System Account (r:1 w:1)166 // Storage: System AllExtrinsicsLen (r:1 w:1)167 // Storage: System BlockWeight (r:1 w:1)168 // Storage: Scheduler Lookup (r:0 w:1)169 fn on_initialize_resolved(s: u32, ) -> Weight {170 (36_252_000 as Weight)171 // Standard Error: 3_000172 .saturating_add((22_662_000 as Weight).saturating_mul(s as Weight))173 .saturating_add(RocksDbWeight::get().reads(4 as Weight))174 .saturating_add(RocksDbWeight::get().writes(4 as Weight))175 .saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))176 }177 // Storage: Scheduler Lookup (r:1 w:1)178 // Storage: Scheduler Agenda (r:1 w:1)179 fn schedule_named(s: u32, ) -> Weight {180 (34_561_000 as Weight)181 // Standard Error: 0182 .saturating_add((161_000 as Weight).saturating_mul(s as Weight))183 .saturating_add(RocksDbWeight::get().reads(2 as Weight))184 .saturating_add(RocksDbWeight::get().writes(2 as Weight))185 }186 // Storage: Scheduler Lookup (r:1 w:1)187 // Storage: Scheduler Agenda (r:1 w:1)188 fn cancel_named(s: u32, ) -> Weight {189 (30_932_000 as Weight)190 // Standard Error: 1_000191 .saturating_add((1_537_000 as Weight).saturating_mul(s as Weight))192 .saturating_add(RocksDbWeight::get().reads(2 as Weight))193 .saturating_add(RocksDbWeight::get().writes(2 as Weight))194 }195}runtime/common/Cargo.tomldiffbeforeafterboth--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -89,7 +89,7 @@
default-features = false
path = "../../pallets/refungible"
-[dependencies.pallet-unq-scheduler]
+[dependencies.pallet-unique-scheduler]
default-features = false
path = "../../pallets/scheduler"
runtime/common/src/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/src/runtime_apis.rs
+++ b/runtime/common/src/runtime_apis.rs
@@ -774,7 +774,7 @@
list_benchmark!(list, extra, pallet_fungible, Fungible);
list_benchmark!(list, extra, pallet_refungible, Refungible);
list_benchmark!(list, extra, pallet_nonfungible, Nonfungible);
- list_benchmark!(list, extra, pallet_unq_scheduler, Scheduler);
+ list_benchmark!(list, extra, pallet_unique_scheduler, Scheduler);
// list_benchmark!(list, extra, pallet_evm_coder_substrate, EvmCoderSubstrate);
let storage_info = AllPalletsReversedWithSystemFirst::storage_info();
@@ -818,7 +818,7 @@
add_benchmark!(params, batches, pallet_fungible, Fungible);
add_benchmark!(params, batches, pallet_refungible, Refungible);
add_benchmark!(params, batches, pallet_nonfungible, Nonfungible);
- add_benchmark!(params, batches, pallet_unq_scheduler, Scheduler);
+ add_benchmark!(params, batches, pallet_unique_scheduler, Scheduler);
// add_benchmark!(params, batches, pallet_evm_coder_substrate, EvmCoderSubstrate);
runtime/opal/Cargo.tomldiffbeforeafterboth--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -36,7 +36,7 @@
'pallet-proxy-rmrk-core/runtime-benchmarks',
'pallet-unique/runtime-benchmarks',
'pallet-inflation/runtime-benchmarks',
- 'pallet-unq-scheduler/runtime-benchmarks',
+ 'pallet-unique-scheduler/runtime-benchmarks',
'pallet-xcm/runtime-benchmarks',
'sp-runtime/runtime-benchmarks',
'xcm-builder/runtime-benchmarks',
@@ -94,7 +94,7 @@
'pallet-proxy-rmrk-core/std',
'pallet-proxy-rmrk-equip/std',
'pallet-unique/std',
- 'pallet-unq-scheduler/std',
+ 'pallet-unique-scheduler/std',
'pallet-charge-transaction/std',
'up-data-structs/std',
'sp-api/std',
@@ -413,7 +413,7 @@
pallet-nonfungible = { default-features = false, path = "../../pallets/nonfungible" }
pallet-proxy-rmrk-core = { default-features = false, path = "../../pallets/proxy-rmrk-core", package = "pallet-rmrk-core" }
pallet-proxy-rmrk-equip = { default-features = false, path = "../../pallets/proxy-rmrk-equip", package = "pallet-rmrk-equip" }
-pallet-unq-scheduler = { path = '../../pallets/scheduler', default-features = false }
+pallet-unique-scheduler = { path = '../../pallets/scheduler', default-features = false }
# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }
pallet-charge-transaction = { git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = "polkadot-v0.9.22", package = "pallet-template-transaction-payment", default-features = false, version = "3.0.0" }
pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false }
runtime/opal/src/lib.rsdiffbeforeafterboth--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -68,7 +68,7 @@
WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients, ConstantMultiplier,
},
};
-use pallet_unq_scheduler::DispatchCall;
+use pallet_unique_scheduler::DispatchCall;
use up_data_structs::{
CollectionId, TokenId, TokenData, Property, PropertyKeyPermission, CollectionLimits,
CollectionStats, RpcCollection,
@@ -966,7 +966,7 @@
}
pub struct SchedulerPaymentExecutor;
-impl<T: frame_system::Config + pallet_unq_scheduler::Config, SelfContainedSignedInfo>
+impl<T: frame_system::Config + pallet_unique_scheduler::Config, SelfContainedSignedInfo>
DispatchCall<T, SelfContainedSignedInfo> for SchedulerPaymentExecutor
where
<T as frame_system::Config>::Call: Member
@@ -976,13 +976,13 @@
+ From<frame_system::Call<Runtime>>,
SelfContainedSignedInfo: Send + Sync + 'static,
Call: From<<T as frame_system::Config>::Call>
- + From<<T as pallet_unq_scheduler::Config>::Call>
+ + From<<T as pallet_unique_scheduler::Config>::Call>
+ SelfContainedCall<SignedInfo = SelfContainedSignedInfo>,
sp_runtime::AccountId32: From<<T as frame_system::Config>::AccountId>,
{
fn dispatch_call(
signer: <T as frame_system::Config>::AccountId,
- call: <T as pallet_unq_scheduler::Config>::Call,
+ call: <T as pallet_unique_scheduler::Config>::Call,
) -> Result<
Result<PostDispatchInfo, DispatchErrorWithPostInfo<PostDispatchInfo>>,
TransactionValidityError,
@@ -1008,7 +1008,7 @@
fn reserve_balance(
id: [u8; 16],
sponsor: <T as frame_system::Config>::AccountId,
- call: <T as pallet_unq_scheduler::Config>::Call,
+ call: <T as pallet_unique_scheduler::Config>::Call,
count: u32,
) -> Result<(), DispatchError> {
let dispatch_info = call.get_dispatch_info();
@@ -1025,7 +1025,7 @@
fn pay_for_call(
id: [u8; 16],
sponsor: <T as frame_system::Config>::AccountId,
- call: <T as pallet_unq_scheduler::Config>::Call,
+ call: <T as pallet_unique_scheduler::Config>::Call,
) -> Result<u128, DispatchError> {
let dispatch_info = call.get_dispatch_info();
let weight: Balance = ChargeTransactionPayment::traditional_fee(0, &dispatch_info, 0);
@@ -1066,7 +1066,7 @@
}
}
-impl pallet_unq_scheduler::Config for Runtime {
+impl pallet_unique_scheduler::Config for Runtime {
type Event = Event;
type Origin = Origin;
type Currency = Balances;
@@ -1155,7 +1155,7 @@
// Unique Pallets
Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,
Unique: pallet_unique::{Pallet, Call, Storage, Event<T>} = 61,
- Scheduler: pallet_unq_scheduler::{Pallet, Call, Storage, Event<T>} = 62,
+ Scheduler: pallet_unique_scheduler::{Pallet, Call, Storage, Event<T>} = 62,
// free = 63
Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64,
// ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,
runtime/quartz/Cargo.tomldiffbeforeafterboth--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -36,7 +36,7 @@
'pallet-proxy-rmrk-core/runtime-benchmarks',
'pallet-unique/runtime-benchmarks',
'pallet-inflation/runtime-benchmarks',
- 'pallet-unq-scheduler/runtime-benchmarks',
+ 'pallet-unique-scheduler/runtime-benchmarks',
'pallet-xcm/runtime-benchmarks',
'sp-runtime/runtime-benchmarks',
'xcm-builder/runtime-benchmarks',
@@ -93,7 +93,7 @@
'pallet-nonfungible/std',
'pallet-proxy-rmrk-core/std',
'pallet-unique/std',
- 'pallet-unq-scheduler/std',
+ 'pallet-unique-scheduler/std',
'pallet-charge-transaction/std',
'up-data-structs/std',
'sp-api/std',
@@ -417,7 +417,7 @@
pallet-refungible = { default-features = false, path = "../../pallets/refungible" }
pallet-nonfungible = { default-features = false, path = "../../pallets/nonfungible" }
pallet-proxy-rmrk-core = { default-features = false, path = "../../pallets/proxy-rmrk-core", package = "pallet-rmrk-core" }
-pallet-unq-scheduler = { path = '../../pallets/scheduler', default-features = false }
+pallet-unique-scheduler = { path = '../../pallets/scheduler', default-features = false }
# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }
pallet-charge-transaction = { git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = "polkadot-v0.9.22", package = "pallet-template-transaction-payment", default-features = false, version = "3.0.0" }
pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false }
runtime/quartz/src/lib.rsdiffbeforeafterboth--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -68,7 +68,7 @@
WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients, ConstantMultiplier,
},
};
-use pallet_unq_scheduler::DispatchCall;
+use pallet_unique_scheduler::DispatchCall;
use up_data_structs::{
CollectionId, TokenId, TokenData, Property, PropertyKeyPermission, CollectionLimits,
CollectionStats, RpcCollection,
@@ -963,7 +963,7 @@
}
pub struct SchedulerPaymentExecutor;
-impl<T: frame_system::Config + pallet_unq_scheduler::Config, SelfContainedSignedInfo>
+impl<T: frame_system::Config + pallet_unique_scheduler::Config, SelfContainedSignedInfo>
DispatchCall<T, SelfContainedSignedInfo> for SchedulerPaymentExecutor
where
<T as frame_system::Config>::Call: Member
@@ -973,13 +973,13 @@
+ From<frame_system::Call<Runtime>>,
SelfContainedSignedInfo: Send + Sync + 'static,
Call: From<<T as frame_system::Config>::Call>
- + From<<T as pallet_unq_scheduler::Config>::Call>
+ + From<<T as pallet_unique_scheduler::Config>::Call>
+ SelfContainedCall<SignedInfo = SelfContainedSignedInfo>,
sp_runtime::AccountId32: From<<T as frame_system::Config>::AccountId>,
{
fn dispatch_call(
signer: <T as frame_system::Config>::AccountId,
- call: <T as pallet_unq_scheduler::Config>::Call,
+ call: <T as pallet_unique_scheduler::Config>::Call,
) -> Result<
Result<PostDispatchInfo, DispatchErrorWithPostInfo<PostDispatchInfo>>,
TransactionValidityError,
@@ -1005,7 +1005,7 @@
fn reserve_balance(
id: [u8; 16],
sponsor: <T as frame_system::Config>::AccountId,
- call: <T as pallet_unq_scheduler::Config>::Call,
+ call: <T as pallet_unique_scheduler::Config>::Call,
count: u32,
) -> Result<(), DispatchError> {
let dispatch_info = call.get_dispatch_info();
@@ -1022,7 +1022,7 @@
fn pay_for_call(
id: [u8; 16],
sponsor: <T as frame_system::Config>::AccountId,
- call: <T as pallet_unq_scheduler::Config>::Call,
+ call: <T as pallet_unique_scheduler::Config>::Call,
) -> Result<u128, DispatchError> {
let dispatch_info = call.get_dispatch_info();
let weight: Balance = ChargeTransactionPayment::traditional_fee(0, &dispatch_info, 0);
@@ -1063,7 +1063,7 @@
}
}
-impl pallet_unq_scheduler::Config for Runtime {
+impl pallet_unique_scheduler::Config for Runtime {
type Event = Event;
type Origin = Origin;
type Currency = Balances;
@@ -1151,7 +1151,7 @@
// Unique Pallets
Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,
Unique: pallet_unique::{Pallet, Call, Storage, Event<T>} = 61,
- Scheduler: pallet_unq_scheduler::{Pallet, Call, Storage, Event<T>} = 62,
+ Scheduler: pallet_unique_scheduler::{Pallet, Call, Storage, Event<T>} = 62,
// free = 63
Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64,
// ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,
runtime/unique/Cargo.tomldiffbeforeafterboth--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -36,7 +36,7 @@
'pallet-proxy-rmrk-core/runtime-benchmarks',
'pallet-unique/runtime-benchmarks',
'pallet-inflation/runtime-benchmarks',
- 'pallet-unq-scheduler/runtime-benchmarks',
+ 'pallet-unique-scheduler/runtime-benchmarks',
'pallet-xcm/runtime-benchmarks',
'sp-runtime/runtime-benchmarks',
'xcm-builder/runtime-benchmarks',
@@ -94,7 +94,7 @@
'pallet-nonfungible/std',
'pallet-proxy-rmrk-core/std',
'pallet-unique/std',
- 'pallet-unq-scheduler/std',
+ 'pallet-unique-scheduler/std',
'pallet-charge-transaction/std',
'up-data-structs/std',
'sp-api/std',
@@ -410,7 +410,7 @@
pallet-refungible = { default-features = false, path = "../../pallets/refungible" }
pallet-nonfungible = { default-features = false, path = "../../pallets/nonfungible" }
pallet-proxy-rmrk-core = { default-features = false, path = "../../pallets/proxy-rmrk-core", package = "pallet-rmrk-core" }
-pallet-unq-scheduler = { path = '../../pallets/scheduler', default-features = false }
+pallet-unique-scheduler = { path = '../../pallets/scheduler', default-features = false }
# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }
pallet-charge-transaction = { git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = "polkadot-v0.9.22", package = "pallet-template-transaction-payment", default-features = false, version = "3.0.0" }
pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false }
runtime/unique/src/lib.rsdiffbeforeafterboth--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -68,7 +68,7 @@
WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients, ConstantMultiplier,
},
};
-use pallet_unq_scheduler::DispatchCall;
+use pallet_unique_scheduler::DispatchCall;
use up_data_structs::{
CollectionId, TokenId, TokenData, Property, PropertyKeyPermission, CollectionLimits,
CollectionStats, RpcCollection,
@@ -962,7 +962,7 @@
}
pub struct SchedulerPaymentExecutor;
-impl<T: frame_system::Config + pallet_unq_scheduler::Config, SelfContainedSignedInfo>
+impl<T: frame_system::Config + pallet_unique_scheduler::Config, SelfContainedSignedInfo>
DispatchCall<T, SelfContainedSignedInfo> for SchedulerPaymentExecutor
where
<T as frame_system::Config>::Call: Member
@@ -972,13 +972,13 @@
+ From<frame_system::Call<Runtime>>,
SelfContainedSignedInfo: Send + Sync + 'static,
Call: From<<T as frame_system::Config>::Call>
- + From<<T as pallet_unq_scheduler::Config>::Call>
+ + From<<T as pallet_unique_scheduler::Config>::Call>
+ SelfContainedCall<SignedInfo = SelfContainedSignedInfo>,
sp_runtime::AccountId32: From<<T as frame_system::Config>::AccountId>,
{
fn dispatch_call(
signer: <T as frame_system::Config>::AccountId,
- call: <T as pallet_unq_scheduler::Config>::Call,
+ call: <T as pallet_unique_scheduler::Config>::Call,
) -> Result<
Result<PostDispatchInfo, DispatchErrorWithPostInfo<PostDispatchInfo>>,
TransactionValidityError,
@@ -1004,7 +1004,7 @@
fn reserve_balance(
id: [u8; 16],
sponsor: <T as frame_system::Config>::AccountId,
- call: <T as pallet_unq_scheduler::Config>::Call,
+ call: <T as pallet_unique_scheduler::Config>::Call,
count: u32,
) -> Result<(), DispatchError> {
let dispatch_info = call.get_dispatch_info();
@@ -1021,7 +1021,7 @@
fn pay_for_call(
id: [u8; 16],
sponsor: <T as frame_system::Config>::AccountId,
- call: <T as pallet_unq_scheduler::Config>::Call,
+ call: <T as pallet_unique_scheduler::Config>::Call,
) -> Result<u128, DispatchError> {
let dispatch_info = call.get_dispatch_info();
let weight: Balance = ChargeTransactionPayment::traditional_fee(0, &dispatch_info, 0);
@@ -1062,7 +1062,7 @@
}
}
-impl pallet_unq_scheduler::Config for Runtime {
+impl pallet_unique_scheduler::Config for Runtime {
type Event = Event;
type Origin = Origin;
type Currency = Balances;
@@ -1150,7 +1150,7 @@
// Unique Pallets
Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,
Unique: pallet_unique::{Pallet, Call, Storage, Event<T>} = 61,
- Scheduler: pallet_unq_scheduler::{Pallet, Call, Storage, Event<T>} = 62,
+ Scheduler: pallet_unique_scheduler::{Pallet, Call, Storage, Event<T>} = 62,
// free = 63
Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64,
// ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,