From 57f0b95978a0eed283cc894724a4ba1c5d4ca258 Mon Sep 17 00:00:00 2001 From: Ludovic_Domingues Date: Wed, 29 Jan 2025 12:13:56 +0100 Subject: [PATCH] Migrating cumulus-pallet-session-benchmarking to Benchmarking V2 (#6564) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Description Migrating cumulus-pallet-session-benchmarking to the new benchmarking syntax v2. This is a part of #6202 --------- Co-authored-by: seemantaggarwal <32275622+seemantaggarwal@users.noreply.github.com> Co-authored-by: Bastian Köcher --- .../pallets/session-benchmarking/src/inner.rs | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/cumulus/pallets/session-benchmarking/src/inner.rs b/cumulus/pallets/session-benchmarking/src/inner.rs index 8d5954304878d..6c5188921362e 100644 --- a/cumulus/pallets/session-benchmarking/src/inner.rs +++ b/cumulus/pallets/session-benchmarking/src/inner.rs @@ -14,29 +14,49 @@ // limitations under the License. //! Benchmarking setup for pallet-session. +#![cfg(feature = "runtime-benchmarks")] use alloc::{vec, vec::Vec}; use codec::Decode; -use frame_benchmarking::{benchmarks, whitelisted_caller}; +use frame_benchmarking::v2::*; use frame_system::RawOrigin; use pallet_session::*; pub struct Pallet(pallet_session::Pallet); pub trait Config: pallet_session::Config {} -benchmarks! { - set_keys { +#[benchmarks] +mod benchmarks { + use super::*; + + #[benchmark] + fn set_keys() -> Result<(), BenchmarkError> { let caller: T::AccountId = whitelisted_caller(); frame_system::Pallet::::inc_providers(&caller); let keys = T::Keys::decode(&mut sp_runtime::traits::TrailingZeroInput::zeroes()).unwrap(); - let proof: Vec = vec![0,1,2,3]; - }: _(RawOrigin::Signed(caller), keys, proof) + let proof: Vec = vec![0, 1, 2, 3]; + + #[extrinsic_call] + _(RawOrigin::Signed(caller), keys, proof); + + Ok(()) + } - purge_keys { + #[benchmark] + fn purge_keys() -> Result<(), BenchmarkError> { let caller: T::AccountId = whitelisted_caller(); frame_system::Pallet::::inc_providers(&caller); let keys = T::Keys::decode(&mut sp_runtime::traits::TrailingZeroInput::zeroes()).unwrap(); - let proof: Vec = vec![0,1,2,3]; - let _t = pallet_session::Pallet::::set_keys(RawOrigin::Signed(caller.clone()).into(), keys, proof); - }: _(RawOrigin::Signed(caller)) + let proof: Vec = vec![0, 1, 2, 3]; + let _t = pallet_session::Pallet::::set_keys( + RawOrigin::Signed(caller.clone()).into(), + keys, + proof, + ); + + #[extrinsic_call] + _(RawOrigin::Signed(caller)); + + Ok(()) + } }