Skip to content
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

Jump to bottom

Upgrade Proxy and Multisig pallets to Benchmarking V2 #6018

Merged
merged 8 commits into from
Oct 15, 2024
Merged

Upgrade Proxy and Multisig pallets to Benchmarking V2 #6018

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bf177fc
migrate benchmarking for proxy pallet
re-gius Oct 10, 2024
d951075
migrate benchmarking for multisig pallet
re-gius Oct 11, 2024
ad13201
nits
re-gius Oct 11, 2024
a967b65
nits
re-gius Oct 11, 2024
2b94f08
nits
re-gius Oct 11, 2024
34fbb22
Update substrate/frame/proxy/src/benchmarking.rs
re-gius Oct 11, 2024
57828cd
fix imports
re-gius Oct 14, 2024
67cd72d
Merge branch 'kiz-frame-umbrella-in-pallets' into regius/migrate-benc…
shawntabrizi Oct 15, 2024
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
123 changes: 73 additions & 50 deletions substrate/frame/multisig/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
#![cfg(feature = "runtime-benchmarks")]

use super::*;
#[allow(deprecated)]
use frame::benchmarking::v1::*;
use frame::benchmarking::v2::*;
kianenigma marked this conversation as resolved.
Show resolved Hide resolved

use crate::Pallet as Multisig;

Expand All @@ -46,10 +45,13 @@ fn setup_multi<T: Config>(
Ok((signatories, Box::new(call)))
}

benchmarks! {
as_multi_threshold_1 {
// Transaction Length
let z in 0 .. 10_000;
#[benchmarks]
mod benchmarks {
use super::*;

// `z`: Transaction Length
#[benchmark]
fn as_multi_threshold_1(z: Linear<0, 10_000>) -> Result<(), BenchmarkError> {
let max_signatories = T::MaxSignatories::get().into();
let (mut signatories, _) = setup_multi::<T>(max_signatories, z)?;
let call: <T as Config>::RuntimeCall = frame_system::Call::<T>::remark {
Expand All @@ -61,33 +63,38 @@ benchmarks! {
// Whitelist caller account from further DB operations.
let caller_key = frame_system::Account::<T>::hashed_key_for(&caller);
add_to_whitelist(caller_key.into());
}: _(RawOrigin::Signed(caller.clone()), signatories, Box::new(call))
verify {

#[extrinsic_call]
_(RawOrigin::Signed(caller.clone()), signatories, Box::new(call));

// If the benchmark resolves, then the call was dispatched successfully.
Ok(())
}

as_multi_create {
// Signatories, need at least 2 total people
let s in 2 .. T::MaxSignatories::get();
// Transaction Length
let z in 0 .. 10_000;
// `z`: Transaction Length
// `s`: Signatories, need at least 2 people
#[benchmark]
fn as_multi_create(s: Linear<2, { T::MaxSignatories::get() }>, z: Linear<0, 10_000>) -> Result<(), BenchmarkError> {
let (mut signatories, call) = setup_multi::<T>(s, z)?;
let call_hash = call.using_encoded(blake2_256);
let multi_account_id = Multisig::<T>::multi_account_id(&signatories, s.try_into().unwrap());
let caller = signatories.pop().ok_or("signatories should have len 2 or more")?;
// Whitelist caller account from further DB operations.
let caller_key = frame_system::Account::<T>::hashed_key_for(&caller);
add_to_whitelist(caller_key.into());
}: as_multi(RawOrigin::Signed(caller), s as u16, signatories, None, call, Weight::zero())
verify {

#[extrinsic_call]
as_multi(RawOrigin::Signed(caller), s as u16, signatories, None, call, Weight::zero());

assert!(Multisigs::<T>::contains_key(multi_account_id, call_hash));

Ok(())
}

as_multi_approve {
// Signatories, need at least 3 people (so we don't complete the multisig)
let s in 3 .. T::MaxSignatories::get();
// Transaction Length
let z in 0 .. 10_000;
// `z`: Transaction Length
// `s`: Signatories, need at least 3 people (so we don't complete the multisig)
#[benchmark]
fn as_multi_approve(s: Linear<3, { T::MaxSignatories::get() }>, z: Linear<0, 10_000>) -> Result<(), BenchmarkError> {
let (mut signatories, call) = setup_multi::<T>(s, z)?;
let call_hash = call.using_encoded(blake2_256);
let multi_account_id = Multisig::<T>::multi_account_id(&signatories, s.try_into().unwrap());
Expand All @@ -101,17 +108,20 @@ benchmarks! {
// Whitelist caller account from further DB operations.
let caller_key = frame_system::Account::<T>::hashed_key_for(&caller2);
add_to_whitelist(caller_key.into());
}: as_multi(RawOrigin::Signed(caller2), s as u16, signatories2, Some(timepoint), call, Weight::zero())
verify {

#[extrinsic_call]
as_multi(RawOrigin::Signed(caller2), s as u16, signatories2, Some(timepoint), call, Weight::zero());

let multisig = Multisigs::<T>::get(multi_account_id, call_hash).ok_or("multisig not created")?;
assert_eq!(multisig.approvals.len(), 2);

Ok(())
}

as_multi_complete {
// Signatories, need at least 2 people
let s in 2 .. T::MaxSignatories::get();
// Transaction Length
let z in 0 .. 10_000;
// `z`: Transaction Length
// `s`: Signatories, need at least 2 people
#[benchmark]
fn as_multi_complete(s: Linear<2, { T::MaxSignatories::get() }>, z: Linear<0, 10_000>) -> Result<(), BenchmarkError> {
let (mut signatories, call) = setup_multi::<T>(s, z)?;
let call_hash = call.using_encoded(blake2_256);
let multi_account_id = Multisig::<T>::multi_account_id(&signatories, s.try_into().unwrap());
Expand All @@ -133,34 +143,40 @@ benchmarks! {
// Whitelist caller account from further DB operations.
let caller_key = frame_system::Account::<T>::hashed_key_for(&caller2);
add_to_whitelist(caller_key.into());
}: as_multi(RawOrigin::Signed(caller2), s as u16, signatories2, Some(timepoint), call, Weight::MAX)
verify {

#[extrinsic_call]
as_multi(RawOrigin::Signed(caller2), s as u16, signatories2, Some(timepoint), call, Weight::MAX);

assert!(!Multisigs::<T>::contains_key(&multi_account_id, call_hash));

Ok(())
}

approve_as_multi_create {
// Signatories, need at least 2 people
let s in 2 .. T::MaxSignatories::get();
// Transaction Length, not a component
let z = 10_000;
// `z`: Transaction Length, not a component
// `s`: Signatories, need at least 2 people
#[benchmark]
fn approve_as_multi_create(s: Linear<2, { T::MaxSignatories::get() }>, z: Linear<0, 10_000>) -> Result<(), BenchmarkError> {
let (mut signatories, call) = setup_multi::<T>(s, z)?;
let multi_account_id = Multisig::<T>::multi_account_id(&signatories, s.try_into().unwrap());
let caller = signatories.pop().ok_or("signatories should have len 2 or more")?;
let call_hash = call.using_encoded(blake2_256);
// Whitelist caller account from further DB operations.
let caller_key = frame_system::Account::<T>::hashed_key_for(&caller);
add_to_whitelist(caller_key.into());

// Create the multi
}: approve_as_multi(RawOrigin::Signed(caller), s as u16, signatories, None, call_hash, Weight::zero())
verify {
#[extrinsic_call]
approve_as_multi(RawOrigin::Signed(caller), s as u16, signatories, None, call_hash, Weight::zero());

assert!(Multisigs::<T>::contains_key(multi_account_id, call_hash));

Ok(())
}

approve_as_multi_approve {
// Signatories, need at least 2 people
let s in 2 .. T::MaxSignatories::get();
// Transaction Length, not a component
let z = 10_000;
// `z`: Transaction Length, not a component
// `s`: Signatories, need at least 2 people
#[benchmark]
fn approve_as_multi_approve(s: Linear<2, { T::MaxSignatories::get() }>, z: Linear<0, 10_000>) -> Result<(), BenchmarkError> {
let (mut signatories, call) = setup_multi::<T>(s, z)?;
let mut signatories2 = signatories.clone();
let multi_account_id = Multisig::<T>::multi_account_id(&signatories, s.try_into().unwrap());
Expand All @@ -181,17 +197,20 @@ benchmarks! {
// Whitelist caller account from further DB operations.
let caller_key = frame_system::Account::<T>::hashed_key_for(&caller2);
add_to_whitelist(caller_key.into());
}: approve_as_multi(RawOrigin::Signed(caller2), s as u16, signatories2, Some(timepoint), call_hash, Weight::zero())
verify {

#[extrinsic_call]
approve_as_multi(RawOrigin::Signed(caller2), s as u16, signatories2, Some(timepoint), call_hash, Weight::zero());

let multisig = Multisigs::<T>::get(multi_account_id, call_hash).ok_or("multisig not created")?;
assert_eq!(multisig.approvals.len(), 2);

Ok(())
}

cancel_as_multi {
// Signatories, need at least 2 people
let s in 2 .. T::MaxSignatories::get();
// Transaction Length, not a component
let z = 10_000;
// `z`: Transaction Length, not a component
// `s`: Signatories, need at least 2 people
#[benchmark]
fn cancel_as_multi(s: Linear<2, T::MaxSignatories::get() >, z: Linear<0, 10_000>) -> Result<(), BenchmarkError> {
let (mut signatories, call) = setup_multi::<T>(s, z)?;
let multi_account_id = Multisig::<T>::multi_account_id(&signatories, s.try_into().unwrap());
let caller = signatories.pop().ok_or("signatories should have len 2 or more")?;
Expand All @@ -204,9 +223,13 @@ benchmarks! {
// Whitelist caller account from further DB operations.
let caller_key = frame_system::Account::<T>::hashed_key_for(&caller);
add_to_whitelist(caller_key.into());
}: _(RawOrigin::Signed(caller), s as u16, signatories, timepoint, call_hash)
verify {

#[extrinsic_call]
_(RawOrigin::Signed(caller), s as u16, signatories, timepoint, call_hash);

assert!(!Multisigs::<T>::contains_key(multi_account_id, call_hash));

Ok(())
}

impl_benchmark_test_suite!(Multisig, crate::tests::new_test_ext(), crate::tests::Test);
Expand Down
Loading
Loading