mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-12 04:11:07 +00:00
Introduce cancel_proposal to rid us of those pesky proposals (#7111)
* Introduce `cancel_proposal` Also fix proposal weight. * Support proposal cancellation from runtime. * Fixes * Fixes * Fixes * Fixes * Fixes * Fixes * Fixes * Fix benchmarks * fix benchmark * whitelisted caller weights * fix build * Fixes * Fixes * Fixes * Fixes * Update frame/democracy/src/lib.rs Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com> * Fixes * Fixes * Fixes * Fixes * Fixes * doc updates * new weights Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
This commit is contained in:
Gavin Wood
@@ -23,20 +23,12 @@ use testing_utils::*;
|
||||
|
||||
use sp_runtime::traits::One;
|
||||
use frame_system::RawOrigin;
|
||||
pub use frame_benchmarking::{benchmarks, account, whitelisted_caller};
|
||||
pub use frame_benchmarking::{benchmarks, account, whitelisted_caller, whitelist_account};
|
||||
const SEED: u32 = 0;
|
||||
const MAX_SPANS: u32 = 100;
|
||||
const MAX_VALIDATORS: u32 = 1000;
|
||||
const MAX_SLASHES: u32 = 1000;
|
||||
|
||||
macro_rules! do_whitelist {
|
||||
($acc:ident) => {
|
||||
frame_benchmarking::benchmarking::add_to_whitelist(
|
||||
frame_system::Account::<T>::hashed_key_for(&$acc).into()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// Add slashing spans to a user account. Not relevant for actual use, only to benchmark
|
||||
// read and write operations.
|
||||
fn add_slashing_spans<T: Trait>(who: &T::AccountId, spans: u32) {
|
||||
@@ -120,7 +112,7 @@ benchmarks! {
|
||||
let controller_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(controller.clone());
|
||||
let reward_destination = RewardDestination::Staked;
|
||||
let amount = T::Currency::minimum_balance() * 10.into();
|
||||
do_whitelist!(stash);
|
||||
whitelist_account!(stash);
|
||||
}: _(RawOrigin::Signed(stash.clone()), controller_lookup, amount, reward_destination)
|
||||
verify {
|
||||
assert!(Bonded::<T>::contains_key(stash));
|
||||
@@ -132,7 +124,7 @@ benchmarks! {
|
||||
let max_additional = T::Currency::minimum_balance() * 10.into();
|
||||
let ledger = Ledger::<T>::get(&controller).ok_or("ledger not created before")?;
|
||||
let original_bonded: BalanceOf<T> = ledger.active;
|
||||
do_whitelist!(stash);
|
||||
whitelist_account!(stash);
|
||||
}: _(RawOrigin::Signed(stash), max_additional)
|
||||
verify {
|
||||
let ledger = Ledger::<T>::get(&controller).ok_or("ledger not created after")?;
|
||||
@@ -145,7 +137,7 @@ benchmarks! {
|
||||
let amount = T::Currency::minimum_balance() * 10.into();
|
||||
let ledger = Ledger::<T>::get(&controller).ok_or("ledger not created before")?;
|
||||
let original_bonded: BalanceOf<T> = ledger.active;
|
||||
do_whitelist!(controller);
|
||||
whitelist_account!(controller);
|
||||
}: _(RawOrigin::Signed(controller.clone()), amount)
|
||||
verify {
|
||||
let ledger = Ledger::<T>::get(&controller).ok_or("ledger not created after")?;
|
||||
@@ -164,7 +156,7 @@ benchmarks! {
|
||||
CurrentEra::put(EraIndex::max_value());
|
||||
let ledger = Ledger::<T>::get(&controller).ok_or("ledger not created before")?;
|
||||
let original_total: BalanceOf<T> = ledger.total;
|
||||
do_whitelist!(controller);
|
||||
whitelist_account!(controller);
|
||||
}: withdraw_unbonded(RawOrigin::Signed(controller.clone()), s)
|
||||
verify {
|
||||
let ledger = Ledger::<T>::get(&controller).ok_or("ledger not created after")?;
|
||||
@@ -183,7 +175,7 @@ benchmarks! {
|
||||
CurrentEra::put(EraIndex::max_value());
|
||||
let ledger = Ledger::<T>::get(&controller).ok_or("ledger not created before")?;
|
||||
let original_total: BalanceOf<T> = ledger.total;
|
||||
do_whitelist!(controller);
|
||||
whitelist_account!(controller);
|
||||
}: withdraw_unbonded(RawOrigin::Signed(controller.clone()), s)
|
||||
verify {
|
||||
assert!(!Ledger::<T>::contains_key(controller));
|
||||
@@ -192,7 +184,7 @@ benchmarks! {
|
||||
validate {
|
||||
let (stash, controller) = create_stash_controller::<T>(USER_SEED, 100, Default::default())?;
|
||||
let prefs = ValidatorPrefs::default();
|
||||
do_whitelist!(controller);
|
||||
whitelist_account!(controller);
|
||||
}: _(RawOrigin::Signed(controller), prefs)
|
||||
verify {
|
||||
assert!(Validators::<T>::contains_key(stash));
|
||||
@@ -203,7 +195,7 @@ benchmarks! {
|
||||
let n in 1 .. MAX_NOMINATIONS as u32;
|
||||
let (stash, controller) = create_stash_controller::<T>(n + 1, 100, Default::default())?;
|
||||
let validators = create_validators::<T>(n, 100)?;
|
||||
do_whitelist!(controller);
|
||||
whitelist_account!(controller);
|
||||
}: _(RawOrigin::Signed(controller), validators)
|
||||
verify {
|
||||
assert!(Nominators::<T>::contains_key(stash));
|
||||
@@ -211,13 +203,13 @@ benchmarks! {
|
||||
|
||||
chill {
|
||||
let (_, controller) = create_stash_controller::<T>(USER_SEED, 100, Default::default())?;
|
||||
do_whitelist!(controller);
|
||||
whitelist_account!(controller);
|
||||
}: _(RawOrigin::Signed(controller))
|
||||
|
||||
set_payee {
|
||||
let (stash, controller) = create_stash_controller::<T>(USER_SEED, 100, Default::default())?;
|
||||
assert_eq!(Payee::<T>::get(&stash), RewardDestination::Staked);
|
||||
do_whitelist!(controller);
|
||||
whitelist_account!(controller);
|
||||
}: _(RawOrigin::Signed(controller), RewardDestination::Controller)
|
||||
verify {
|
||||
assert_eq!(Payee::<T>::get(&stash), RewardDestination::Controller);
|
||||
@@ -227,7 +219,7 @@ benchmarks! {
|
||||
let (stash, _) = create_stash_controller::<T>(USER_SEED, 100, Default::default())?;
|
||||
let new_controller = create_funded_user::<T>("new_controller", USER_SEED, 100);
|
||||
let new_controller_lookup = T::Lookup::unlookup(new_controller.clone());
|
||||
do_whitelist!(stash);
|
||||
whitelist_account!(stash);
|
||||
}: _(RawOrigin::Signed(stash), new_controller_lookup)
|
||||
verify {
|
||||
assert!(Ledger::<T>::contains_key(&new_controller));
|
||||
@@ -350,7 +342,7 @@ benchmarks! {
|
||||
}
|
||||
Ledger::<T>::insert(controller.clone(), staking_ledger.clone());
|
||||
let original_bonded: BalanceOf<T> = staking_ledger.active;
|
||||
do_whitelist!(controller);
|
||||
whitelist_account!(controller);
|
||||
}: _(RawOrigin::Signed(controller.clone()), (l + 100).into())
|
||||
verify {
|
||||
let ledger = Ledger::<T>::get(&controller).ok_or("ledger not created after")?;
|
||||
@@ -381,7 +373,7 @@ benchmarks! {
|
||||
let (stash, controller) = create_stash_controller::<T>(0, 100, Default::default())?;
|
||||
add_slashing_spans::<T>(&stash, s);
|
||||
T::Currency::make_free_balance_be(&stash, 0.into());
|
||||
do_whitelist!(controller);
|
||||
whitelist_account!(controller);
|
||||
}: _(RawOrigin::Signed(controller), stash.clone(), s)
|
||||
verify {
|
||||
assert!(!Bonded::<T>::contains_key(&stash));
|
||||
@@ -516,7 +508,7 @@ benchmarks! {
|
||||
|
||||
let era = <Staking<T>>::current_era().unwrap_or(0);
|
||||
let caller: T::AccountId = account("caller", n, SEED);
|
||||
do_whitelist!(caller);
|
||||
whitelist_account!(caller);
|
||||
}: {
|
||||
let result = <Staking<T>>::submit_election_solution(
|
||||
RawOrigin::Signed(caller.clone()).into(),
|
||||
@@ -584,7 +576,7 @@ benchmarks! {
|
||||
|
||||
let era = <Staking<T>>::current_era().unwrap_or(0);
|
||||
let caller: T::AccountId = account("caller", n, SEED);
|
||||
do_whitelist!(caller);
|
||||
whitelist_account!(caller);
|
||||
|
||||
// submit a very bad solution on-chain
|
||||
{
|
||||
@@ -638,7 +630,7 @@ benchmarks! {
|
||||
<EraElectionStatus<T>>::put(ElectionStatus::Open(T::BlockNumber::from(1u32)));
|
||||
let era = <Staking<T>>::current_era().unwrap_or(0);
|
||||
let caller: T::AccountId = account("caller", n, SEED);
|
||||
do_whitelist!(caller);
|
||||
whitelist_account!(caller);
|
||||
|
||||
// submit a seq-phragmen with all the good stuff on chain.
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user