Skip to content

[stable2506] Backport #9516 #9519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bkontur merged 1 commit into from
Aug 20, 2025
Merged

[stable2506] Backport #9516 #9519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 33 additions & 33 deletions ...mes/collectives/collectives-westend/src/weights/pallet_core_fellowship_ambassador_core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
//! Autogenerated weights for `pallet_core_fellowship`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
//! DATE: 2025-02-21, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! DATE: 2025-08-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `e0f303704c84`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
//! HOSTNAME: `84c341e0cc82`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: 1024

// Executed Command:
Expand Down Expand Up @@ -56,8 +56,8 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 7_440_000 picoseconds.
Weight::from_parts(7_680_000, 0)
// Minimum execution time: 7_554_000 picoseconds.
Weight::from_parts(7_864_000, 0)
.saturating_add(Weight::from_parts(0, 0))
.saturating_add(T::DbWeight::get().writes(1))
}
Expand All @@ -67,8 +67,8 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
// Proof Size summary in bytes:
// Measured: `471`
// Estimated: `1853`
// Minimum execution time: 13_394_000 picoseconds.
Weight::from_parts(13_901_000, 0)
// Minimum execution time: 13_535_000 picoseconds.
Weight::from_parts(14_145_000, 0)
.saturating_add(Weight::from_parts(0, 1853))
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
Expand All @@ -91,8 +91,8 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
// Proof Size summary in bytes:
// Measured: `66402`
// Estimated: `69046`
// Minimum execution time: 153_853_000 picoseconds.
Weight::from_parts(156_514_000, 0)
// Minimum execution time: 135_970_000 picoseconds.
Weight::from_parts(140_241_000, 0)
.saturating_add(Weight::from_parts(0, 69046))
.saturating_add(T::DbWeight::get().reads(6))
.saturating_add(T::DbWeight::get().writes(6))
Expand All @@ -113,10 +113,10 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
/// Proof: `AmbassadorCollective::IndexToId` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
fn bump_demote() -> Weight {
// Proof Size summary in bytes:
// Measured: `66512`
// Measured: `66794`
// Estimated: `69046`
// Minimum execution time: 160_754_000 picoseconds.
Weight::from_parts(163_413_000, 0)
// Minimum execution time: 144_523_000 picoseconds.
Weight::from_parts(148_624_000, 0)
.saturating_add(Weight::from_parts(0, 69046))
.saturating_add(T::DbWeight::get().reads(6))
.saturating_add(T::DbWeight::get().writes(6))
Expand All @@ -129,8 +129,8 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
// Proof Size summary in bytes:
// Measured: `360`
// Estimated: `3514`
// Minimum execution time: 18_700_000 picoseconds.
Weight::from_parts(19_547_000, 0)
// Minimum execution time: 18_809_000 picoseconds.
Weight::from_parts(19_532_000, 0)
.saturating_add(Weight::from_parts(0, 3514))
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(1))
Expand All @@ -149,8 +149,8 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
// Proof Size summary in bytes:
// Measured: `118`
// Estimated: `3514`
// Minimum execution time: 26_627_000 picoseconds.
Weight::from_parts(27_508_000, 0)
// Minimum execution time: 27_052_000 picoseconds.
Weight::from_parts(27_750_000, 0)
.saturating_add(Weight::from_parts(0, 3514))
.saturating_add(T::DbWeight::get().reads(3))
.saturating_add(T::DbWeight::get().writes(5))
Expand All @@ -171,10 +171,10 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
/// Proof: `AmbassadorCollective::IdToIndex` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
fn promote() -> Weight {
// Proof Size summary in bytes:
// Measured: `66055`
// Measured: `66034`
// Estimated: `69046`
// Minimum execution time: 152_255_000 picoseconds.
Weight::from_parts(156_279_000, 0)
// Minimum execution time: 130_553_000 picoseconds.
Weight::from_parts(134_895_000, 0)
.saturating_add(Weight::from_parts(0, 69046))
.saturating_add(T::DbWeight::get().reads(5))
.saturating_add(T::DbWeight::get().writes(6))
Expand All @@ -193,15 +193,15 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
/// Proof: `AmbassadorCollective::IdToIndex` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
/// The range of component `r` is `[1, 9]`.
/// The range of component `r` is `[1, 9]`.
fn promote_fast(r: u16, ) -> Weight {
fn promote_fast(r: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `65968`
// Estimated: `69046 + r * (2489 ±0)`
// Minimum execution time: 139_374_000 picoseconds.
Weight::from_parts(127_034_613, 0)
// Minimum execution time: 125_739_000 picoseconds.
Weight::from_parts(113_300_436, 0)
.saturating_add(Weight::from_parts(0, 69046))
// Standard Error: 69_443
.saturating_add(Weight::from_parts(17_266_639, 0).saturating_mul(r.into()))
// Standard Error: 56_138
.saturating_add(Weight::from_parts(17_588_278, 0).saturating_mul(r.into()))
.saturating_add(T::DbWeight::get().reads(3))
.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
.saturating_add(T::DbWeight::get().writes(3))
Expand All @@ -218,8 +218,8 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
// Proof Size summary in bytes:
// Measured: `265`
// Estimated: `3514`
// Minimum execution time: 20_162_000 picoseconds.
Weight::from_parts(21_252_000, 0)
// Minimum execution time: 20_086_000 picoseconds.
Weight::from_parts(21_944_000, 0)
.saturating_add(Weight::from_parts(0, 3514))
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(2))
Expand All @@ -232,8 +232,8 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
// Proof Size summary in bytes:
// Measured: `285`
// Estimated: `3514`
// Minimum execution time: 17_440_000 picoseconds.
Weight::from_parts(18_338_000, 0)
// Minimum execution time: 17_667_000 picoseconds.
Weight::from_parts(18_528_000, 0)
.saturating_add(Weight::from_parts(0, 3514))
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(1))
Expand All @@ -246,8 +246,8 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
// Proof Size summary in bytes:
// Measured: `285`
// Estimated: `3514`
// Minimum execution time: 17_493_000 picoseconds.
Weight::from_parts(18_180_000, 0)
// Minimum execution time: 17_270_000 picoseconds.
Weight::from_parts(18_034_000, 0)
.saturating_add(Weight::from_parts(0, 3514))
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(1))
Expand All @@ -262,8 +262,8 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
// Proof Size summary in bytes:
// Measured: `65967`
// Estimated: `69046`
// Minimum execution time: 136_105_000 picoseconds.
Weight::from_parts(140_663_000, 0)
// Minimum execution time: 114_446_000 picoseconds.
Weight::from_parts(116_637_000, 0)
.saturating_add(Weight::from_parts(0, 69046))
.saturating_add(T::DbWeight::get().reads(3))
.saturating_add(T::DbWeight::get().writes(2))
Expand All @@ -276,8 +276,8 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
// Proof Size summary in bytes:
// Measured: `151`
// Estimated: `69046`
// Minimum execution time: 109_134_000 picoseconds.
Weight::from_parts(116_891_000, 0)
// Minimum execution time: 93_223_000 picoseconds.
Weight::from_parts(94_688_000, 0)
.saturating_add(Weight::from_parts(0, 69046))
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(1))
Expand Down
66 changes: 33 additions & 33 deletions ...mes/collectives/collectives-westend/src/weights/pallet_core_fellowship_fellowship_core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
//! Autogenerated weights for `pallet_core_fellowship`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
//! DATE: 2025-02-21, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! DATE: 2025-08-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `e0f303704c84`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
//! HOSTNAME: `84c341e0cc82`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: 1024

// Executed Command:
Expand Down Expand Up @@ -56,8 +56,8 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 7_297_000 picoseconds.
Weight::from_parts(7_627_000, 0)
// Minimum execution time: 7_455_000 picoseconds.
Weight::from_parts(8_021_000, 0)
.saturating_add(Weight::from_parts(0, 0))
.saturating_add(T::DbWeight::get().writes(1))
}
Expand All @@ -67,8 +67,8 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
// Proof Size summary in bytes:
// Measured: `399`
// Estimated: `1853`
// Minimum execution time: 12_682_000 picoseconds.
Weight::from_parts(13_216_000, 0)
// Minimum execution time: 12_844_000 picoseconds.
Weight::from_parts(13_388_000, 0)
.saturating_add(Weight::from_parts(0, 1853))
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
Expand All @@ -91,8 +91,8 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
// Proof Size summary in bytes:
// Measured: `66430`
// Estimated: `69046`
// Minimum execution time: 152_458_000 picoseconds.
Weight::from_parts(157_010_000, 0)
// Minimum execution time: 136_300_000 picoseconds.
Weight::from_parts(139_333_000, 0)
.saturating_add(Weight::from_parts(0, 69046))
.saturating_add(T::DbWeight::get().reads(6))
.saturating_add(T::DbWeight::get().writes(6))
Expand All @@ -113,10 +113,10 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
/// Proof: `FellowshipCollective::IndexToId` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
fn bump_demote() -> Weight {
// Proof Size summary in bytes:
// Measured: `66540`
// Measured: `66822`
// Estimated: `69046`
// Minimum execution time: 158_587_000 picoseconds.
Weight::from_parts(161_550_000, 0)
// Minimum execution time: 146_172_000 picoseconds.
Weight::from_parts(149_061_000, 0)
.saturating_add(Weight::from_parts(0, 69046))
.saturating_add(T::DbWeight::get().reads(6))
.saturating_add(T::DbWeight::get().writes(6))
Expand All @@ -129,8 +129,8 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
// Proof Size summary in bytes:
// Measured: `388`
// Estimated: `3514`
// Minimum execution time: 18_716_000 picoseconds.
Weight::from_parts(19_932_000, 0)
// Minimum execution time: 18_312_000 picoseconds.
Weight::from_parts(18_790_000, 0)
.saturating_add(Weight::from_parts(0, 3514))
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(1))
Expand All @@ -149,8 +149,8 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
// Proof Size summary in bytes:
// Measured: `146`
// Estimated: `3514`
// Minimum execution time: 26_497_000 picoseconds.
Weight::from_parts(27_206_000, 0)
// Minimum execution time: 26_303_000 picoseconds.
Weight::from_parts(27_122_000, 0)
.saturating_add(Weight::from_parts(0, 3514))
.saturating_add(T::DbWeight::get().reads(3))
.saturating_add(T::DbWeight::get().writes(5))
Expand All @@ -171,10 +171,10 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
/// Proof: `FellowshipCollective::IdToIndex` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
fn promote() -> Weight {
// Proof Size summary in bytes:
// Measured: `66083`
// Measured: `66062`
// Estimated: `69046`
// Minimum execution time: 151_518_000 picoseconds.
Weight::from_parts(157_727_000, 0)
// Minimum execution time: 131_037_000 picoseconds.
Weight::from_parts(133_767_000, 0)
.saturating_add(Weight::from_parts(0, 69046))
.saturating_add(T::DbWeight::get().reads(5))
.saturating_add(T::DbWeight::get().writes(6))
Expand All @@ -193,15 +193,15 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
/// Proof: `FellowshipCollective::IdToIndex` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
/// The range of component `r` is `[1, 9]`.
/// The range of component `r` is `[1, 9]`.
fn promote_fast(r: u16, ) -> Weight {
fn promote_fast(r: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `65996`
// Estimated: `69046 + r * (2489 ±0)`
// Minimum execution time: 136_170_000 picoseconds.
Weight::from_parts(128_244_484, 0)
// Minimum execution time: 124_574_000 picoseconds.
Weight::from_parts(114_614_991, 0)
.saturating_add(Weight::from_parts(0, 69046))
// Standard Error: 57_831
.saturating_add(Weight::from_parts(15_803_547, 0).saturating_mul(r.into()))
// Standard Error: 64_534
.saturating_add(Weight::from_parts(17_415_815, 0).saturating_mul(r.into()))
.saturating_add(T::DbWeight::get().reads(3))
.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
.saturating_add(T::DbWeight::get().writes(3))
Expand All @@ -218,8 +218,8 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
// Proof Size summary in bytes:
// Measured: `293`
// Estimated: `3514`
// Minimum execution time: 19_527_000 picoseconds.
Weight::from_parts(20_252_000, 0)
// Minimum execution time: 19_710_000 picoseconds.
Weight::from_parts(20_542_000, 0)
.saturating_add(Weight::from_parts(0, 3514))
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(2))
Expand All @@ -232,8 +232,8 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
// Proof Size summary in bytes:
// Measured: `313`
// Estimated: `3514`
// Minimum execution time: 16_904_000 picoseconds.
Weight::from_parts(17_395_000, 0)
// Minimum execution time: 16_592_000 picoseconds.
Weight::from_parts(17_755_000, 0)
.saturating_add(Weight::from_parts(0, 3514))
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(1))
Expand All @@ -246,8 +246,8 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
// Proof Size summary in bytes:
// Measured: `313`
// Estimated: `3514`
// Minimum execution time: 16_951_000 picoseconds.
Weight::from_parts(17_461_000, 0)
// Minimum execution time: 16_967_000 picoseconds.
Weight::from_parts(17_431_000, 0)
.saturating_add(Weight::from_parts(0, 3514))
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(1))
Expand All @@ -262,8 +262,8 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
// Proof Size summary in bytes:
// Measured: `65995`
// Estimated: `69046`
// Minimum execution time: 131_499_000 picoseconds.
Weight::from_parts(134_233_000, 0)
// Minimum execution time: 113_258_000 picoseconds.
Weight::from_parts(115_605_000, 0)
.saturating_add(Weight::from_parts(0, 69046))
.saturating_add(T::DbWeight::get().reads(3))
.saturating_add(T::DbWeight::get().writes(2))
Expand All @@ -276,8 +276,8 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
// Proof Size summary in bytes:
// Measured: `79`
// Estimated: `69046`
// Minimum execution time: 103_987_000 picoseconds.
Weight::from_parts(106_231_000, 0)
// Minimum execution time: 93_773_000 picoseconds.
Weight::from_parts(95_088_000, 0)
.saturating_add(Weight::from_parts(0, 69046))
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(1))
Expand Down
9 changes: 9 additions & 0 deletions prdoc/pr_9516.prdoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
title: Fix for `promote_fast` benchmark
doc:
- audience: Runtime Dev
description: Fixed benchmark generation/compilation for `promote_fast` `MaxRank` change from `u32` to `u16`.
crates:
- name: collectives-westend-runtime
bump: patch
- name: pallet-core-fellowship
bump: patch
2 changes: 1 addition & 1 deletion substrate/frame/core-fellowship/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ mod benchmarks {
fn promote_fast(
r: Linear<1, { ConvertU16ToU32::<T::MaxRank>::get() }>,
) -> Result<(), BenchmarkError> {
// Get target rank for promotion.
// Get a target rank for promotion.
let max_rank = T::MaxRank::get();
let target_rank = (r as u16).min(max_rank);

Expand Down
2 changes: 1 addition & 1 deletion substrate/frame/core-fellowship/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ pub mod pallet {
/// This is useful for out-of-band promotions, hence it has its own `FastPromoteOrigin` to
/// be (possibly) more restrictive than `PromoteOrigin`. Note that the member must already
/// be inducted.
#[pallet::weight(T::WeightInfo::promote_fast(*to_rank))]
#[pallet::weight(T::WeightInfo::promote_fast(*to_rank as u32))]
#[pallet::call_index(10)]
pub fn promote_fast(
origin: OriginFor<T>,
Expand Down
6 changes: 3 additions & 3 deletions substrate/frame/core-fellowship/src/weights.rs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading