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

Enhance dispatch #738

Closed
guanqun wants to merge 21 commits into from
Closed

Enhance dispatch #738

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e4c01c1
sr-support: add SystemOrigin(Signed(who))
Sep 13, 2018
5bdd1ae
sr-support: add back json generation
Sep 13, 2018
32dd71e
sr-support: fix the unit test
Sep 13, 2018
59ac5aa
sr-support: pass the trait instance parameter down
Sep 13, 2018
9972a5d
sr-support: revert back the changes in runtime for now
Sep 13, 2018
b62fa39
sr-support: add CouncilOrigin
Sep 15, 2018
52fcb1e
democracy: update this module's origin declaration
Sep 15, 2018
ac5bbac
update balance module
Sep 15, 2018
507ddcd
update consensus module
Sep 15, 2018
f04f2b4
update concil module
Sep 15, 2018
087a0e9
update treasury module
Sep 15, 2018
bed938e
update example module
Sep 15, 2018
f879331
update staking module
Sep 15, 2018
aeb9c96
update council voting module
Sep 15, 2018
b3e6b51
update session module
Sep 15, 2018
2ff8f26
update council motion module
Sep 15, 2018
433a569
update left modules
Sep 15, 2018
b40006d
sr-support: add inherent check
Sep 16, 2018
a16c725
update timestamp to replace the inherent check
Sep 16, 2018
a909ce4
update consensus's inherent check
Sep 16, 2018
00b6f45
fix the test warning
Sep 16, 2018
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
Prev Previous commit
Next Next commit
update treasury module
  • Loading branch information
Guanqun Lu committed Sep 16, 2018
commit 087a0e92b4f19b6fa690a5a4e203efce5941eae4
24 changes: 11 additions & 13 deletions srml/treasury/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ use runtime_support::{StorageValue, StorageMap};
use runtime_support::dispatch::Result;
use runtime_primitives::{Permill, traits::{OnFinalise, Zero, EnsureOrigin}};
use balances::OnDilution;
use system::ensure_signed;

/// Our module's configuration trait. All our types and consts go in here. If the
/// module is dependent on specific other modules, then their configuration traits
Expand Down Expand Up @@ -74,7 +73,7 @@ decl_module! {
// Put forward a suggestion for spending. A deposit proportional to the value
// is reserved and slashed if the proposal is rejected. It is returned once the
// proposal is awarded.
fn propose_spend(origin, value: T::Balance, beneficiary: T::AccountId) -> Result;
fn propose_spend(SystemOrigin(Signed(proposer)), value: T::Balance, beneficiary: T::AccountId) -> Result;

// Set the balance of funds available to spend.
fn set_pot(new_pot: T::Balance) -> Result;
Expand Down Expand Up @@ -158,8 +157,7 @@ impl<T: Trait> Module<T> {

// Implement Calls and add public immutables and private mutables.

fn propose_spend(origin: T::Origin, value: T::Balance, beneficiary: T::AccountId) -> Result {
let proposer = ensure_signed(origin)?;
fn propose_spend(proposer: T::AccountId, value: T::Balance, beneficiary: T::AccountId) -> Result {

let bond = Self::calculate_bond(value);
<balances::Module<T>>::reserve(&proposer, bond)
Expand Down Expand Up @@ -412,7 +410,7 @@ mod tests {
#[test]
fn spend_proposal_takes_min_deposit() {
with_externalities(&mut new_test_ext(), || {
assert_ok!(Treasury::propose_spend(Origin::signed(0), 1, 3));
assert_ok!(Treasury::propose_spend(0, 1, 3));
assert_eq!(Balances::free_balance(&0), 99);
assert_eq!(Balances::reserved_balance(&0), 1);
});
Expand All @@ -421,7 +419,7 @@ mod tests {
#[test]
fn spend_proposal_takes_proportional_deposit() {
with_externalities(&mut new_test_ext(), || {
assert_ok!(Treasury::propose_spend(Origin::signed(0), 100, 3));
assert_ok!(Treasury::propose_spend(0, 100, 3));
assert_eq!(Balances::free_balance(&0), 95);
assert_eq!(Balances::reserved_balance(&0), 5);
});
Expand All @@ -430,7 +428,7 @@ mod tests {
#[test]
fn spend_proposal_fails_when_proposer_poor() {
with_externalities(&mut new_test_ext(), || {
assert_noop!(Treasury::propose_spend(Origin::signed(2), 100, 3), "Proposer's balance too low");
assert_noop!(Treasury::propose_spend(2, 100, 3), "Proposer's balance too low");
});
}

Expand All @@ -439,7 +437,7 @@ mod tests {
with_externalities(&mut new_test_ext(), || {
Treasury::on_dilution(100, 100);

assert_ok!(Treasury::propose_spend(Origin::signed(0), 100, 3));
assert_ok!(Treasury::propose_spend(0, 100, 3));
assert_ok!(Treasury::approve_proposal(Origin::ROOT, 0));

<Treasury as OnFinalise<u64>>::on_finalise(1);
Expand All @@ -463,7 +461,7 @@ mod tests {
with_externalities(&mut new_test_ext(), || {
Treasury::on_dilution(100, 100);

assert_ok!(Treasury::propose_spend(Origin::signed(0), 100, 3));
assert_ok!(Treasury::propose_spend(0, 100, 3));
assert_ok!(Treasury::reject_proposal(Origin::ROOT, 0));

<Treasury as OnFinalise<u64>>::on_finalise(2);
Expand All @@ -477,7 +475,7 @@ mod tests {
with_externalities(&mut new_test_ext(), || {
Treasury::on_dilution(100, 100);

assert_ok!(Treasury::propose_spend(Origin::signed(0), 100, 3));
assert_ok!(Treasury::propose_spend(0, 100, 3));
assert_ok!(Treasury::reject_proposal(Origin::ROOT, 0));
assert_noop!(Treasury::reject_proposal(Origin::ROOT, 0), "No proposal at that index");
});
Expand All @@ -502,7 +500,7 @@ mod tests {
with_externalities(&mut new_test_ext(), || {
Treasury::on_dilution(100, 100);

assert_ok!(Treasury::propose_spend(Origin::signed(0), 100, 3));
assert_ok!(Treasury::propose_spend(0, 100, 3));
assert_ok!(Treasury::reject_proposal(Origin::ROOT, 0));
assert_noop!(Treasury::approve_proposal(Origin::ROOT, 0), "No proposal at that index");
});
Expand All @@ -513,7 +511,7 @@ mod tests {
with_externalities(&mut new_test_ext(), || {
Treasury::on_dilution(100, 100);

assert_ok!(Treasury::propose_spend(Origin::signed(0), 100, 3));
assert_ok!(Treasury::propose_spend(0, 100, 3));
assert_ok!(Treasury::approve_proposal(Origin::ROOT, 0));

<Treasury as OnFinalise<u64>>::on_finalise(2);
Expand All @@ -527,7 +525,7 @@ mod tests {
with_externalities(&mut new_test_ext(), || {
Treasury::on_dilution(100, 100);

assert_ok!(Treasury::propose_spend(Origin::signed(0), 150, 3));
assert_ok!(Treasury::propose_spend(0, 150, 3));
assert_ok!(Treasury::approve_proposal(Origin::ROOT, 0));

<Treasury as OnFinalise<u64>>::on_finalise(2);
Expand Down