Skip to content

Commit abd6341

Browse files
lrazoviclrazovic
committed
feat: restore old scehduler weights
1 parent 0003a62 commit abd6341

File tree

3 files changed

+72
-103
lines changed

3 files changed

+72
-103
lines changed

‎pallets/funding/src/mock.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ parameter_types! {
155155
pub const ApprovalDeposit: Balance = EXISTENTIAL_DEPOSIT;
156156

157157
}
158+
158159
impl pallet_assets::Config<ContributionTokensInstance> for TestRuntime {
159160
type ApprovalDeposit = ApprovalDeposit;
160161
type AssetAccountDeposit = ZeroAssetAccountDeposit;
@@ -180,12 +181,14 @@ impl pallet_assets::Config<ContributionTokensInstance> for TestRuntime {
180181

181182
#[cfg(feature = "runtime-benchmarks")]
182183
pub struct PalletAssetsBenchmarkHelper;
184+
183185
#[cfg(feature = "runtime-benchmarks")]
184186
impl pallet_assets::BenchmarkHelper<Location> for PalletAssetsBenchmarkHelper {
185187
fn create_asset_id_parameter(id: u32) -> Location {
186188
(Parent, Parachain(id)).into()
187189
}
188190
}
191+
189192
impl pallet_assets::Config<ForeignAssetsInstance> for TestRuntime {
190193
type ApprovalDeposit = ApprovalDeposit;
191194
type AssetAccountDeposit = AssetAccountDeposit;
@@ -208,6 +211,7 @@ impl pallet_assets::Config<ForeignAssetsInstance> for TestRuntime {
208211
type StringLimit = AssetsStringLimit;
209212
type WeightInfo = ();
210213
}
214+
211215
parameter_types! {
212216
pub const BlockHashCount: u32 = 250;
213217
}
@@ -281,10 +285,6 @@ parameter_types! {
281285
pub const MinVestedTransfer: u64 = 256 * 2;
282286
pub UnvestedFundsAllowedWithdrawReasons: WithdrawReasons =
283287
WithdrawReasons::except(WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE);
284-
pub PolimecReceiverInfo: XcmPalletInfo = XcmPalletInfo::new(
285-
51, "PolimecReceiver".into(), "polimec_receiver".into(), 0, 1, 0
286-
).unwrap();
287-
}
288288

289289
#[cfg(feature = "runtime-benchmarks")]
290290
parameter_types! {
@@ -406,6 +406,7 @@ parameter_types! {
406406
pub const FeeRecipient: AccountId = 80085;
407407
pub const RootId: PalletId = PalletId(*b"treasury");
408408
}
409+
409410
impl pallet_proxy_bonding::Config for TestRuntime {
410411
type BondingToken = Balances;
411412
type BondingTokenDecimals = ConstU8<PLMC_DECIMALS>;

‎runtimes/polimec/src/lib.rs

+13-46
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ use frame_support::{
3232
fungible::{Credit, HoldConsideration, Inspect},
3333
fungibles,
3434
tokens::{self, ConversionToAssetBalance, PayFromAccount, UnityAssetBalanceConversion},
35-
AsEnsureOriginWithArg, ConstU32, Contains, EitherOfDiverse, InstanceFilter, LinearStoragePrice, PrivilegeCmp,
35+
AsEnsureOriginWithArg, ConstU32, EitherOfDiverse, Everything, InstanceFilter, LinearStoragePrice, PrivilegeCmp,
3636
TransformOrigin,
3737
},
3838
weights::{ConstantMultiplier, Weight},
@@ -169,13 +169,13 @@ pub type Migrations = migrations::Unreleased;
169169
/// The runtime migrations per release.
170170
#[allow(missing_docs)]
171171
pub mod migrations {
172-
use crate::Runtime;
172+
use crate::Runtime;
173173

174174
/// Unreleased migrations. Add new ones here:
175175
#[allow(unused_parens)]
176176
pub type Unreleased = (
177-
super::custom_migrations::asset_id_migration::FromOldAssetIdMigration,
178-
pallet_funding::storage_migrations::v6::MigrationToV6<Runtime>,
177+
super::custom_migrations::asset_id_migration::FromOldAssetIdMigration,
178+
pallet_funding::storage_migrations::v6::MigrationToV6<Runtime>,
179179
);
180180
}
181181

@@ -225,7 +225,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
225225
spec_version: 1_000_000,
226226
impl_version: 0,
227227
apis: RUNTIME_API_VERSIONS,
228-
transaction_version: 6,
228+
transaction_version: 7,
229229
state_version: 1,
230230
};
231231

@@ -240,39 +240,6 @@ parameter_types! {
240240
pub const SS58Prefix: u16 = 41;
241241
}
242242

243-
pub struct BaseCallFilter;
244-
impl Contains<RuntimeCall> for BaseCallFilter {
245-
fn contains(c: &RuntimeCall) -> bool {
246-
match c {
247-
RuntimeCall::Funding(call) => {
248-
if cfg!(feature = "development-settings") {
249-
true
250-
} else {
251-
matches!(
252-
call,
253-
pallet_funding::Call::create_project { .. }
254-
| pallet_funding::Call::remove_project { .. }
255-
| pallet_funding::Call::edit_project { .. }
256-
| pallet_funding::Call::start_evaluation { .. }
257-
| pallet_funding::Call::evaluate { .. }
258-
| pallet_funding::Call::end_evaluation { .. }
259-
| pallet_funding::Call::bid { .. }
260-
| pallet_funding::Call::end_funding { .. }
261-
| pallet_funding::Call::start_settlement { .. }
262-
| pallet_funding::Call::settle_evaluation { .. }
263-
| pallet_funding::Call::settle_bid { .. }
264-
| pallet_funding::Call::mark_project_as_settled { .. }
265-
| pallet_funding::Call::start_offchain_migration { .. }
266-
| pallet_funding::Call::confirm_offchain_migration { .. }
267-
| pallet_funding::Call::mark_project_ct_migration_as_finished { .. }
268-
)
269-
}
270-
},
271-
_ => true,
272-
}
273-
}
274-
}
275-
276243
impl InstanceFilter<RuntimeCall> for Type {
277244
fn filter(&self, c: &RuntimeCall) -> bool {
278245
match self {
@@ -301,13 +268,13 @@ impl InstanceFilter<RuntimeCall> for Type {
301268
),
302269
proxy::Type::Governance => matches!(
303270
c,
304-
RuntimeCall::Treasury(..)
305-
| RuntimeCall::Democracy(..)
306-
| RuntimeCall::Council(..)
307-
| RuntimeCall::TechnicalCommittee(..)
308-
| RuntimeCall::Elections(..)
309-
| RuntimeCall::Preimage(..)
310-
| RuntimeCall::Scheduler(..)
271+
RuntimeCall::Treasury(..) |
272+
RuntimeCall::Democracy(..) |
273+
RuntimeCall::Council(..) |
274+
RuntimeCall::TechnicalCommittee(..) |
275+
RuntimeCall::Elections(..) |
276+
RuntimeCall::Preimage(..) |
277+
RuntimeCall::Scheduler(..)
311278
),
312279
proxy::Type::Staking => {
313280
matches!(c, RuntimeCall::ParachainStaking(..))
@@ -336,7 +303,7 @@ impl frame_system::Config for Runtime {
336303
/// The identifier used to distinguish between accounts.
337304
type AccountId = AccountId;
338305
/// The basic call filter to use in dispatchable.
339-
type BaseCallFilter = BaseCallFilter;
306+
type BaseCallFilter = Everything;
340307
/// The block type.
341308
type Block = Block;
342309
/// Maximum number of block number to block hash mappings to keep (oldest pruned first).

‎runtimes/polimec/src/weights/pallet_scheduler.rs

+54-53
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//! Autogenerated weights for `pallet_scheduler`
33
//!
44
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 39.0.0
5-
//! DATE: 2025-02-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
5+
//! DATE: 2024-08-30, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
66
//! WORST CASE MAP SIZE: `1000000`
77
//! HOSTNAME: `ip-172-31-23-147`, CPU: `AMD EPYC 9R14`
88
//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("polimec-paseo-local")`, DB CACHE: 1024
@@ -36,8 +36,8 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
3636
// Proof Size summary in bytes:
3737
// Measured: `31`
3838
// Estimated: `1489`
39-
// Minimum execution time: 3_150_000 picoseconds.
40-
Weight::from_parts(3_340_000, 0)
39+
// Minimum execution time: 2_990_000 picoseconds.
40+
Weight::from_parts(3_170_000, 0)
4141
.saturating_add(Weight::from_parts(0, 1489))
4242
.saturating_add(T::DbWeight::get().reads(1))
4343
.saturating_add(T::DbWeight::get().writes(1))
@@ -49,24 +49,24 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
4949
// Proof Size summary in bytes:
5050
// Measured: `78 + s * (177 ±0)`
5151
// Estimated: `42428`
52-
// Minimum execution time: 3_550_000 picoseconds.
53-
Weight::from_parts(5_723_705, 0)
52+
// Minimum execution time: 3_280_000 picoseconds.
53+
Weight::from_parts(5_264_100, 0)
5454
.saturating_add(Weight::from_parts(0, 42428))
55-
// Standard Error: 984
56-
.saturating_add(Weight::from_parts(285_866, 0).saturating_mul(s.into()))
55+
// Standard Error: 903
56+
.saturating_add(Weight::from_parts(281_751, 0).saturating_mul(s.into()))
5757
.saturating_add(T::DbWeight::get().reads(1))
5858
.saturating_add(T::DbWeight::get().writes(1))
5959
}
6060
fn service_task_base() -> Weight {
6161
// Proof Size summary in bytes:
6262
// Measured: `0`
6363
// Estimated: `0`
64-
// Minimum execution time: 1_970_000 picoseconds.
65-
Weight::from_parts(2_110_000, 0)
64+
// Minimum execution time: 2_120_000 picoseconds.
65+
Weight::from_parts(2_240_000, 0)
6666
.saturating_add(Weight::from_parts(0, 0))
6767
}
6868
/// Storage: `Preimage::PreimageFor` (r:1 w:1)
69-
/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
69+
/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `Measured`)
7070
/// Storage: `Preimage::StatusFor` (r:1 w:0)
7171
/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
7272
/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
@@ -75,48 +75,49 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
7575
fn service_task_fetched(s: u32, ) -> Weight {
7676
// Proof Size summary in bytes:
7777
// Measured: `179 + s * (1 ±0)`
78-
// Estimated: `4197809`
79-
// Minimum execution time: 14_311_000 picoseconds.
80-
Weight::from_parts(14_810_000, 0)
81-
.saturating_add(Weight::from_parts(0, 4197809))
82-
// Standard Error: 5
83-
.saturating_add(Weight::from_parts(705, 0).saturating_mul(s.into()))
78+
// Estimated: `3644 + s * (1 ±0)`
79+
// Minimum execution time: 13_680_000 picoseconds.
80+
Weight::from_parts(13_990_000, 0)
81+
.saturating_add(Weight::from_parts(0, 3644))
82+
// Standard Error: 0
83+
.saturating_add(Weight::from_parts(675, 0).saturating_mul(s.into()))
8484
.saturating_add(T::DbWeight::get().reads(3))
8585
.saturating_add(T::DbWeight::get().writes(2))
86+
.saturating_add(Weight::from_parts(0, 1).saturating_mul(s.into()))
8687
}
8788
/// Storage: `Scheduler::Lookup` (r:0 w:1)
8889
/// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
8990
fn service_task_named() -> Weight {
9091
// Proof Size summary in bytes:
9192
// Measured: `0`
9293
// Estimated: `0`
93-
// Minimum execution time: 2_910_000 picoseconds.
94-
Weight::from_parts(3_160_000, 0)
94+
// Minimum execution time: 3_050_000 picoseconds.
95+
Weight::from_parts(3_220_000, 0)
9596
.saturating_add(Weight::from_parts(0, 0))
9697
.saturating_add(T::DbWeight::get().writes(1))
9798
}
9899
fn service_task_periodic() -> Weight {
99100
// Proof Size summary in bytes:
100101
// Measured: `0`
101102
// Estimated: `0`
102-
// Minimum execution time: 2_020_000 picoseconds.
103-
Weight::from_parts(2_120_000, 0)
103+
// Minimum execution time: 2_120_000 picoseconds.
104+
Weight::from_parts(2_240_000, 0)
104105
.saturating_add(Weight::from_parts(0, 0))
105106
}
106107
fn execute_dispatch_signed() -> Weight {
107108
// Proof Size summary in bytes:
108109
// Measured: `0`
109110
// Estimated: `0`
110-
// Minimum execution time: 1_370_000 picoseconds.
111-
Weight::from_parts(1_470_000, 0)
111+
// Minimum execution time: 1_430_000 picoseconds.
112+
Weight::from_parts(1_540_000, 0)
112113
.saturating_add(Weight::from_parts(0, 0))
113114
}
114115
fn execute_dispatch_unsigned() -> Weight {
115116
// Proof Size summary in bytes:
116117
// Measured: `0`
117118
// Estimated: `0`
118-
// Minimum execution time: 1_360_000 picoseconds.
119-
Weight::from_parts(1_480_000, 0)
119+
// Minimum execution time: 1_330_000 picoseconds.
120+
Weight::from_parts(1_460_000, 0)
120121
.saturating_add(Weight::from_parts(0, 0))
121122
}
122123
/// Storage: `Scheduler::Agenda` (r:1 w:1)
@@ -126,11 +127,11 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
126127
// Proof Size summary in bytes:
127128
// Measured: `78 + s * (177 ±0)`
128129
// Estimated: `42428`
129-
// Minimum execution time: 7_531_000 picoseconds.
130-
Weight::from_parts(9_350_752, 0)
130+
// Minimum execution time: 7_370_000 picoseconds.
131+
Weight::from_parts(9_052_492, 0)
131132
.saturating_add(Weight::from_parts(0, 42428))
132-
// Standard Error: 1_003
133-
.saturating_add(Weight::from_parts(311_567, 0).saturating_mul(s.into()))
133+
// Standard Error: 870
134+
.saturating_add(Weight::from_parts(303_988, 0).saturating_mul(s.into()))
134135
.saturating_add(T::DbWeight::get().reads(1))
135136
.saturating_add(T::DbWeight::get().writes(1))
136137
}
@@ -145,11 +146,11 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
145146
// Proof Size summary in bytes:
146147
// Measured: `78 + s * (177 ±0)`
147148
// Estimated: `42428`
148-
// Minimum execution time: 11_590_000 picoseconds.
149-
Weight::from_parts(11_013_013, 0)
149+
// Minimum execution time: 11_120_000 picoseconds.
150+
Weight::from_parts(10_709_113, 0)
150151
.saturating_add(Weight::from_parts(0, 42428))
151-
// Standard Error: 881
152-
.saturating_add(Weight::from_parts(479_214, 0).saturating_mul(s.into()))
152+
// Standard Error: 748
153+
.saturating_add(Weight::from_parts(458_934, 0).saturating_mul(s.into()))
153154
.saturating_add(T::DbWeight::get().reads(1))
154155
.saturating_add(T::DbWeight::get().writes(3))
155156
}
@@ -162,11 +163,11 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
162163
// Proof Size summary in bytes:
163164
// Measured: `255 + s * (185 ±0)`
164165
// Estimated: `42428`
165-
// Minimum execution time: 9_930_000 picoseconds.
166-
Weight::from_parts(13_072_200, 0)
166+
// Minimum execution time: 9_820_000 picoseconds.
167+
Weight::from_parts(12_920_198, 0)
167168
.saturating_add(Weight::from_parts(0, 42428))
168-
// Standard Error: 1_820
169-
.saturating_add(Weight::from_parts(334_502, 0).saturating_mul(s.into()))
169+
// Standard Error: 1_825
170+
.saturating_add(Weight::from_parts(328_024, 0).saturating_mul(s.into()))
170171
.saturating_add(T::DbWeight::get().reads(2))
171172
.saturating_add(T::DbWeight::get().writes(2))
172173
}
@@ -181,11 +182,11 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
181182
// Proof Size summary in bytes:
182183
// Measured: `281 + s * (185 ±0)`
183184
// Estimated: `42428`
184-
// Minimum execution time: 13_470_000 picoseconds.
185-
Weight::from_parts(13_629_213, 0)
185+
// Minimum execution time: 13_150_000 picoseconds.
186+
Weight::from_parts(13_327_341, 0)
186187
.saturating_add(Weight::from_parts(0, 42428))
187-
// Standard Error: 933
188-
.saturating_add(Weight::from_parts(500_166, 0).saturating_mul(s.into()))
188+
// Standard Error: 876
189+
.saturating_add(Weight::from_parts(481_053, 0).saturating_mul(s.into()))
189190
.saturating_add(T::DbWeight::get().reads(2))
190191
.saturating_add(T::DbWeight::get().writes(3))
191192
}
@@ -198,11 +199,11 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
198199
// Proof Size summary in bytes:
199200
// Measured: `118`
200201
// Estimated: `42428`
201-
// Minimum execution time: 7_251_000 picoseconds.
202-
Weight::from_parts(7_567_002, 0)
202+
// Minimum execution time: 7_050_000 picoseconds.
203+
Weight::from_parts(7_457_450, 0)
203204
.saturating_add(Weight::from_parts(0, 42428))
204-
// Standard Error: 469
205-
.saturating_add(Weight::from_parts(20_312, 0).saturating_mul(s.into()))
205+
// Standard Error: 424
206+
.saturating_add(Weight::from_parts(16_593, 0).saturating_mul(s.into()))
206207
.saturating_add(T::DbWeight::get().reads(1))
207208
.saturating_add(T::DbWeight::get().writes(2))
208209
}
@@ -214,8 +215,8 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
214215
// Proof Size summary in bytes:
215216
// Measured: `8928`
216217
// Estimated: `42428`
217-
// Minimum execution time: 19_250_000 picoseconds.
218-
Weight::from_parts(20_471_000, 0)
218+
// Minimum execution time: 18_210_000 picoseconds.
219+
Weight::from_parts(19_060_000, 0)
219220
.saturating_add(Weight::from_parts(0, 42428))
220221
.saturating_add(T::DbWeight::get().reads(1))
221222
.saturating_add(T::DbWeight::get().writes(1))
@@ -230,8 +231,8 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
230231
// Proof Size summary in bytes:
231232
// Measured: `9606`
232233
// Estimated: `42428`
233-
// Minimum execution time: 24_490_000 picoseconds.
234-
Weight::from_parts(25_270_000, 0)
234+
// Minimum execution time: 23_120_000 picoseconds.
235+
Weight::from_parts(24_030_000, 0)
235236
.saturating_add(Weight::from_parts(0, 42428))
236237
.saturating_add(T::DbWeight::get().reads(2))
237238
.saturating_add(T::DbWeight::get().writes(1))
@@ -244,8 +245,8 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
244245
// Proof Size summary in bytes:
245246
// Measured: `8940`
246247
// Estimated: `42428`
247-
// Minimum execution time: 18_790_000 picoseconds.
248-
Weight::from_parts(19_400_000, 0)
248+
// Minimum execution time: 17_950_000 picoseconds.
249+
Weight::from_parts(18_380_000, 0)
249250
.saturating_add(Weight::from_parts(0, 42428))
250251
.saturating_add(T::DbWeight::get().reads(1))
251252
.saturating_add(T::DbWeight::get().writes(1))
@@ -260,10 +261,10 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
260261
// Proof Size summary in bytes:
261262
// Measured: `9618`
262263
// Estimated: `42428`
263-
// Minimum execution time: 23_540_000 picoseconds.
264-
Weight::from_parts(24_480_000, 0)
264+
// Minimum execution time: 22_420_000 picoseconds.
265+
Weight::from_parts(23_171_000, 0)
265266
.saturating_add(Weight::from_parts(0, 42428))
266267
.saturating_add(T::DbWeight::get().reads(2))
267268
.saturating_add(T::DbWeight::get().writes(1))
268269
}
269-
}
270+
}

0 commit comments

Comments
 (0)