pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-19 15:45:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make priviledged functions explicity use origin (#3045)

Browse Source 
* Make priviledged functions explicity use `origin`

* Fix typo in docs

* Fix more tests

* Remove `root` pathway, add semicolons
This commit is contained in:
Shawn Tabrizi
2019-07-08 15:51:54 +02:00
committed by Bastian Köcher
parent 29311e98b4
commit 3d72844710
11 changed files with 71 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/srml/democracy/src/lib.rs
+8 -5
View File
@@ -513,16 +513,19 @@ decl_module! {
}
/// Remove a referendum.
fn cancel_referendum(#[compact] ref_index: ReferendumIndex) {
fn cancel_referendum(origin, #[compact] ref_index: ReferendumIndex) {
ensure_root(origin)?;
Self::clear_referendum(ref_index);
}
/// Cancel a proposal queued for enactment.
fn cancel_queued(
origin,
#[compact] when: T::BlockNumber,
#[compact] which: u32,
#[compact] what: ReferendumIndex
) {
ensure_root(origin)?;
let which = which as usize;
let mut items = <DispatchQueue<T>>::get(when);
if items.get(which).and_then(Option::as_ref).map_or(false, |x| x.1 == what) {
@@ -1473,9 +1476,9 @@ mod tests {
Some((set_balance_proposal(2), 0))
]);
assert_noop!(Democracy::cancel_queued(3, 0, 0), "proposal not found");
assert_noop!(Democracy::cancel_queued(4, 1, 0), "proposal not found");
assert_ok!(Democracy::cancel_queued(4, 0, 0));
assert_noop!(Democracy::cancel_queued(Origin::ROOT, 3, 0, 0), "proposal not found");
assert_noop!(Democracy::cancel_queued(Origin::ROOT, 4, 1, 0), "proposal not found");
assert_ok!(Democracy::cancel_queued(Origin::ROOT, 4, 0, 0));
assert_eq!(Democracy::dispatch_queue(4), vec![None]);
});
}
@@ -1774,7 +1777,7 @@ mod tests {
0
).unwrap();
assert_ok!(Democracy::vote(Origin::signed(1), r, AYE));
assert_ok!(Democracy::cancel_referendum(r.into()));
assert_ok!(Democracy::cancel_referendum(Origin::ROOT, r.into()));
next_block();
next_block();