Update to latest master (#137)

This commit is contained in:
Gav Wood
2019-02-13 15:36:54 +01:00
committed by GitHub
parent cdb2faf155
commit 91c7abd7dc
7 changed files with 417 additions and 211 deletions
+3
View File
@@ -188,11 +188,13 @@ impl session::Trait for Runtime {
}
impl staking::Trait for Runtime {
type Currency = Balances;
type OnRewardMinted = Treasury;
type Event = Event;
}
impl democracy::Trait for Runtime {
type Currency = Balances;
type Proposal = Call;
type Event = Event;
}
@@ -212,6 +214,7 @@ impl council::motions::Trait for Runtime {
}
impl treasury::Trait for Runtime {
type Currency = Balances;
type ApproveOrigin = council_motions::EnsureMembers<_4>;
type RejectOrigin = council_motions::EnsureMembers<_2>;
type Event = Event;