Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

pallet-collective | port to frame v2 #8151

Closed
shamb0 wants to merge 11 commits into from
Closed

pallet-collective | port to frame v2 #8151

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3491c8e
port to frame v2 | basic pallet compilation up
shamb0 Feb 18, 2021
6334f1a
port to frame v2 | unit test up
shamb0 Feb 18, 2021
a464af6
port to frame v2 | unit test up
shamb0 Feb 19, 2021
6474607
wk2107 | bringup | unit test & benchmarking
shamb0 Feb 20, 2021
f34c82c
Update frame/collective/src/mock.rs
shamb0 Feb 24, 2021
a74c310
Update frame/collective/src/lib.rs
shamb0 Feb 24, 2021
4fbce2c
Update frame/collective/src/lib.rs
shamb0 Feb 24, 2021
cd06c81
impl and use in balances
gui1117 Feb 24, 2021
141db8a
wk2108 | rework on review comments
shamb0 Feb 24, 2021
7a02ec6
Merge branch 'gui-benchmark-pallet-instantiable' of https://github.co…
shamb0 Feb 24, 2021
a390d8f
wk2108 | update on benchmarks.rs
shamb0 Feb 24, 2021
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
31 changes: 16 additions & 15 deletions frame/collective/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@

//! Staking pallet benchmarking.

#![cfg(feature = "runtime-benchmarks")]

use super::*;

use frame_system::RawOrigin as SystemOrigin;
use frame_system::EventRecord;
use frame_benchmarking::{
benchmarks_instance,
benchmarks,
account,
whitelisted_caller,
impl_benchmark_test_suite,
Expand All @@ -35,18 +37,17 @@ use frame_system::Module as System;
use crate::Module as Collective;

const SEED: u32 = 0;

const MAX_BYTES: u32 = 1_024;

fn assert_last_event<T: Config<I>, I: Instance>(generic_event: <T as Config<I>>::Event) {
fn assert_last_event<T: Config<I>, I: 'static>(generic_event: <T as Config<I>>::Event) {
let events = System::<T>::events();
let system_event: <T as frame_system::Config>::Event = generic_event.into();
// compare to the last event record
let EventRecord { event, .. } = &events[events.len() - 1];
assert_eq!(event, &system_event);
}

benchmarks_instance! {
Copy link
Contributor

@gui1117 gui1117 Feb 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why did you change this to benchmark ?

NOTE: I think pallet-balance should make use of benchmarks_instance.

Copy link
Contributor

@gui1117 gui1117 Feb 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok it is not supported, waiting on #8190

benchmarks! {
set_members {
let m in 1 .. T::MaxMembers::get();
let n in 1 .. T::MaxMembers::get();
Expand Down Expand Up @@ -137,7 +138,7 @@ benchmarks_instance! {
verify {
let proposal_hash = T::Hashing::hash_of(&proposal);
// Note that execution fails due to mis-matched origin
assert_last_event::<T, I>(
assert_last_event::<T, _>(
RawEvent::MemberExecuted(proposal_hash, Err(DispatchError::BadOrigin)).into()
);
}
Expand Down Expand Up @@ -168,7 +169,7 @@ benchmarks_instance! {
verify {
let proposal_hash = T::Hashing::hash_of(&proposal);
// Note that execution fails due to mis-matched origin
assert_last_event::<T, I>(
assert_last_event::<T, _>(
RawEvent::Executed(proposal_hash, Err(DispatchError::BadOrigin)).into()
);
}
Expand Down Expand Up @@ -213,7 +214,7 @@ benchmarks_instance! {
// New proposal is recorded
assert_eq!(Collective::<T, _>::proposals().len(), p as usize);
let proposal_hash = T::Hashing::hash_of(&proposal);
assert_last_event::<T, I>(RawEvent::Proposed(caller, p - 1, proposal_hash, threshold).into());
assert_last_event::<T, _>(RawEvent::Proposed(caller, p - 1, proposal_hash, threshold).into());
}

vote {
Expand Down Expand Up @@ -287,7 +288,7 @@ benchmarks_instance! {
verify {
// All proposals exist and the last proposal has just been updated.
assert_eq!(Collective::<T, _>::proposals().len(), p as usize);
let voting = Collective::<T, _>::voting(&last_hash).ok_or(Error::<T, I>::ProposalMissing)?;
let voting = Collective::<T, _>::voting(&last_hash).ok_or(Error::<T, _>::ProposalMissing)?;
assert_eq!(voting.ayes.len(), (m - 3) as usize);
assert_eq!(voting.nays.len(), 1);
}
Expand Down Expand Up @@ -369,7 +370,7 @@ benchmarks_instance! {
verify {
// The last proposal is removed.
assert_eq!(Collective::<T, _>::proposals().len(), (p - 1) as usize);
assert_last_event::<T, I>(RawEvent::Disapproved(last_hash).into());
assert_last_event::<T, _>(RawEvent::Disapproved(last_hash).into());
}

close_early_approved {
Expand Down Expand Up @@ -450,7 +451,7 @@ benchmarks_instance! {
verify {
// The last proposal is removed.
assert_eq!(Collective::<T, _>::proposals().len(), (p - 1) as usize);
assert_last_event::<T, I>(RawEvent::Executed(last_hash, Err(DispatchError::BadOrigin)).into());
assert_last_event::<T, _>(RawEvent::Executed(last_hash, Err(DispatchError::BadOrigin)).into());
}

close_disapproved {
Expand Down Expand Up @@ -522,7 +523,7 @@ benchmarks_instance! {
}: close(SystemOrigin::Signed(caller), last_hash, index, Weight::max_value(), bytes_in_storage)
verify {
assert_eq!(Collective::<T, _>::proposals().len(), (p - 1) as usize);
assert_last_event::<T, I>(RawEvent::Disapproved(last_hash).into());
assert_last_event::<T, _>(RawEvent::Disapproved(last_hash).into());
}

close_approved {
Expand Down Expand Up @@ -586,7 +587,7 @@ benchmarks_instance! {
}: close(SystemOrigin::Signed(caller), last_hash, p - 1, Weight::max_value(), bytes_in_storage)
verify {
assert_eq!(Collective::<T, _>::proposals().len(), (p - 1) as usize);
assert_last_event::<T, I>(RawEvent::Executed(last_hash, Err(DispatchError::BadOrigin)).into());
assert_last_event::<T, _>(RawEvent::Executed(last_hash, Err(DispatchError::BadOrigin)).into());
}

disapprove_proposal {
Expand Down Expand Up @@ -634,12 +635,12 @@ benchmarks_instance! {
}: _(SystemOrigin::Root, last_hash)
verify {
assert_eq!(Collective::<T, _>::proposals().len(), (p - 1) as usize);
assert_last_event::<T, I>(RawEvent::Disapproved(last_hash).into());
assert_last_event::<T, _>(RawEvent::Disapproved(last_hash).into());
}
}

impl_benchmark_test_suite!(
Collective,
crate::tests::new_test_ext(),
crate::tests::Test,
crate::mock::new_test_ext(),
crate::mock::Test,
);
Loading