pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-31 20:21:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate pallet-democracy to pallet attribute macro (#8824)

Browse Source 
* Migrate pallet-democracy to pallet attribute macro.

* Metadata fix.

* Trigger CI.
This commit is contained in:
Shaun Wang
2021-06-03 20:30:21 +12:00
committed by GitHub
parent 152587bcb9
commit 7ec6ebb627
5 changed files with 440 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/democracy/src/benchmarking.rs
+7 -8
View File
@@ -21,9 +21,8 @@ use super::*;
use frame_benchmarking::{benchmarks, account, whitelist_account, impl_benchmark_test_suite};
use frame_support::{
assert_noop, assert_ok, IterableStorageMap,
traits::{Currency, Get, EnsureOrigin, OnInitialize, UnfilteredDispatchable,
schedule::DispatchTime},
assert_noop, assert_ok,
traits::{Currency, Get, EnsureOrigin, OnInitialize, UnfilteredDispatchable, schedule::DispatchTime},
};
use frame_system::{RawOrigin, Pallet as System, self};
use sp_runtime::traits::{Bounded, One};
@@ -69,13 +68,13 @@ fn add_referendum<T: Config>(n: u32) -> Result<ReferendumIndex, &'static str> {
vote_threshold,
0u32.into(),
);
let referendum_index: ReferendumIndex = ReferendumCount::get() - 1;
let referendum_index: ReferendumIndex = ReferendumCount::<T>::get() - 1;
T::Scheduler::schedule_named(
(DEMOCRACY_ID, referendum_index).encode(),
DispatchTime::At(1u32.into()),
None,
63,
system::RawOrigin::Root.into(),
frame_system::RawOrigin::Root.into(),
Call::enact_proposal(proposal_hash, referendum_index).into(),
).map_err(|_| "failed to schedule named")?;
Ok(referendum_index)
@@ -360,7 +359,7 @@ benchmarks! {
assert_eq!(Democracy::<T>::referendum_count(), r, "referenda not created");
// Launch external
LastTabledWasExternal::put(false);
LastTabledWasExternal::<T>::put(false);
let origin = T::ExternalMajorityOrigin::successful_origin();
let proposal_hash = T::Hashing::hash_of(&r);
@@ -402,7 +401,7 @@ benchmarks! {
// Launch public
assert!(add_proposal::<T>(r).is_ok(), "proposal not created");
LastTabledWasExternal::put(true);
LastTabledWasExternal::<T>::put(true);
let block_number = T::LaunchPeriod::get();
@@ -760,7 +759,7 @@ benchmarks! {
}: enact_proposal(RawOrigin::Root, proposal_hash, 0)
verify {
// Fails due to mismatched origin
assert_last_event::<T>(RawEvent::Executed(0, false).into());
assert_last_event::<T>(Event::<T>::Executed(0, false).into());
}
#[extra]