From db3ff60b5af2a9017cb968a4727835f3d00340f0 Mon Sep 17 00:00:00 2001
From: Ludovic_Domingues <ludovic.domingues96@gmail.com>
Date: Mon, 27 Jan 2025 15:37:00 +0100
Subject: [PATCH] Migrating polkadot-runtime-common slots benchmarking to v2
(#6614)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
#Description
Migrated polkadot-runtime-parachains slots benchmarking to the new
benchmarking syntax v2.
This is part of #6202
---------
Co-authored-by: Giuseppe Re <giuseppe.re@parity.io>
Co-authored-by: seemantaggarwal <32275622+seemantaggarwal@users.noreply.github.com>
Co-authored-by: Bastian Köcher <git@kchr.de>
---
polkadot/runtime/common/src/slots/mod.rs | 121 ++++++++++++++---------
1 file changed, 76 insertions(+), 45 deletions(-)
diff --git a/polkadot/runtime/common/src/slots/mod.rs b/polkadot/runtime/common/src/slots/mod.rs
index 131a75f3d74..1fbfe451dcb 100644
--- a/polkadot/runtime/common/src/slots/mod.rs
+++ b/polkadot/runtime/common/src/slots/mod.rs
@@ -149,7 +149,7 @@ pub mod pallet {
if let Some((lease_period, first_block)) = Self::lease_period_index(n) {
// If we're beginning a new lease period then handle that.
if first_block {
- return Self::manage_lease_period_start(lease_period)
+ return Self::manage_lease_period_start(lease_period);
}
}
@@ -237,7 +237,7 @@ impl<T: Config> Pallet<T> {
let mut parachains = Vec::new();
for (para, mut lease_periods) in Leases::<T>::iter() {
if lease_periods.is_empty() {
- continue
+ continue;
}
// ^^ should never be empty since we would have deleted the entry otherwise.
@@ -381,7 +381,7 @@ impl<T: Config> Leaser<BlockNumberFor<T>> for Pallet<T> {
// attempt.
//
// We bail, not giving any lease and leave it for governance to sort out.
- return Err(LeaseError::AlreadyLeased)
+ return Err(LeaseError::AlreadyLeased);
}
} else if d.len() == i {
// Doesn't exist. This is usual.
@@ -488,7 +488,7 @@ impl<T: Config> Leaser<BlockNumberFor<T>> for Pallet<T> {
for slot in offset..=offset + period_count {
if let Some(Some(_)) = leases.get(slot) {
// If there exists any lease period, we exit early and return true.
- return true
+ return true;
}
}
@@ -962,7 +962,7 @@ mod benchmarking {
use polkadot_runtime_parachains::paras;
use sp_runtime::traits::{Bounded, One};
- use frame_benchmarking::{account, benchmarks, whitelisted_caller, BenchmarkError};
+ use frame_benchmarking::v2::*;
use crate::slots::Pallet as Slots;
@@ -998,10 +998,15 @@ mod benchmarking {
(para, leaser)
}
- benchmarks! {
- where_clause { where T: paras::Config }
+ #[benchmarks(
+ where T: paras::Config,
+ )]
- force_lease {
+ mod benchmarks {
+ use super::*;
+
+ #[benchmark]
+ fn force_lease() -> Result<(), BenchmarkError> {
// If there is an offset, we need to be on that block to be able to do lease things.
frame_system::Pallet::<T>::set_block_number(T::LeaseOffset::get() + One::one());
let para = ParaId::from(1337);
@@ -1012,23 +1017,32 @@ mod benchmarking {
let period_count = 3u32.into();
let origin =
T::ForceOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
- }: _<T::RuntimeOrigin>(origin, para, leaser.clone(), amount, period_begin, period_count)
- verify {
- assert_last_event::<T>(Event::<T>::Leased {
- para_id: para,
- leaser, period_begin,
- period_count,
- extra_reserved: amount,
- total_amount: amount,
- }.into());
- }
- // Worst case scenario, T on-demand parachains onboard, and C lease holding parachains offboard.
- manage_lease_period_start {
- // Assume reasonable maximum of 100 paras at any time
- let c in 0 .. 100;
- let t in 0 .. 100;
+ #[extrinsic_call]
+ _(origin as T::RuntimeOrigin, para, leaser.clone(), amount, period_begin, period_count);
+
+ assert_last_event::<T>(
+ Event::<T>::Leased {
+ para_id: para,
+ leaser,
+ period_begin,
+ period_count,
+ extra_reserved: amount,
+ total_amount: amount,
+ }
+ .into(),
+ );
+ Ok(())
+ }
+
+ // Worst case scenario, T on-demand parachains onboard, and C lease holding parachains
+ // offboard. Assume reasonable maximum of 100 paras at any time
+ #[benchmark]
+ fn manage_lease_period_start(
+ c: Linear<0, 100>,
+ t: Linear<0, 100>,
+ ) -> Result<(), BenchmarkError> {
let period_begin = 1u32.into();
let period_count = 4u32.into();
@@ -1036,9 +1050,7 @@ mod benchmarking {
frame_system::Pallet::<T>::set_block_number(T::LeaseOffset::get() + One::one());
// Make T parathreads (on-demand parachains)
- let paras_info = (0..t).map(|i| {
- register_a_parathread::<T>(i)
- }).collect::<Vec<_>>();
+ let paras_info = (0..t).map(|i| register_a_parathread::<T>(i)).collect::<Vec<_>>();
T::Registrar::execute_pending_transitions();
@@ -1053,43 +1065,48 @@ mod benchmarking {
T::Registrar::execute_pending_transitions();
// C lease holding parachains are downgrading to on-demand parachains
- for i in 200 .. 200 + c {
- let (para, leaser) = register_a_parathread::<T>(i);
+ for i in 200..200 + c {
+ let (para, _) = register_a_parathread::<T>(i);
T::Registrar::make_parachain(para)?;
}
T::Registrar::execute_pending_transitions();
- for i in 0 .. t {
+ for i in 0..t {
assert!(T::Registrar::is_parathread(ParaId::from(i)));
}
- for i in 200 .. 200 + c {
+ for i in 200..200 + c {
assert!(T::Registrar::is_parachain(ParaId::from(i)));
}
- }: {
- Slots::<T>::manage_lease_period_start(period_begin);
- } verify {
+ #[block]
+ {
+ let _ = Slots::<T>::manage_lease_period_start(period_begin);
+ }
+
// All paras should have switched.
T::Registrar::execute_pending_transitions();
- for i in 0 .. t {
+ for i in 0..t {
assert!(T::Registrar::is_parachain(ParaId::from(i)));
}
- for i in 200 .. 200 + c {
+ for i in 200..200 + c {
assert!(T::Registrar::is_parathread(ParaId::from(i)));
}
+
+ Ok(())
}
// Assume that at most 8 people have deposits for leases on a parachain.
// This would cover at least 4 years of leases in the worst case scenario.
- clear_all_leases {
+ #[benchmark]
+ fn clear_all_leases() -> Result<(), BenchmarkError> {
let max_people = 8;
let (para, _) = register_a_parathread::<T>(1);
// If there is an offset, we need to be on that block to be able to do lease things.
frame_system::Pallet::<T>::set_block_number(T::LeaseOffset::get() + One::one());
- for i in 0 .. max_people {
+ for i in 0..max_people {
let leaser = account("lease_deposit", i, 0);
let amount = T::Currency::minimum_balance();
T::Currency::make_free_balance_be(&leaser, BalanceOf::<T>::max_value());
@@ -1102,31 +1119,45 @@ mod benchmarking {
Slots::<T>::force_lease(origin, para, leaser, amount, period_begin, period_count)?;
}
- for i in 0 .. max_people {
+ for i in 0..max_people {
let leaser = account("lease_deposit", i, 0);
assert_eq!(T::Currency::reserved_balance(&leaser), T::Currency::minimum_balance());
}
let origin =
T::ForceOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
- }: _<T::RuntimeOrigin>(origin, para)
- verify {
- for i in 0 .. max_people {
+
+ #[extrinsic_call]
+ _(origin as T::RuntimeOrigin, para);
+
+ for i in 0..max_people {
let leaser = account("lease_deposit", i, 0);
assert_eq!(T::Currency::reserved_balance(&leaser), 0u32.into());
}
+
+ Ok(())
}
- trigger_onboard {
+ #[benchmark]
+ fn trigger_onboard() -> Result<(), BenchmarkError> {
// get a parachain into a bad state where they did not onboard
let (para, _) = register_a_parathread::<T>(1);
- Leases::<T>::insert(para, vec![Some((account::<T::AccountId>("lease_insert", 0, 0), BalanceOf::<T>::default()))]);
+ Leases::<T>::insert(
+ para,
+ vec![Some((
+ account::<T::AccountId>("lease_insert", 0, 0),
+ BalanceOf::<T>::default(),
+ ))],
+ );
assert!(T::Registrar::is_parathread(para));
let caller = whitelisted_caller();
- }: _(RawOrigin::Signed(caller), para)
- verify {
+
+ #[extrinsic_call]
+ _(RawOrigin::Signed(caller), para);
+
T::Registrar::execute_pending_transitions();
assert!(T::Registrar::is_parachain(para));
+ Ok(())
}
impl_benchmark_test_suite!(
--
GitLab