pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-19 01:51:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

code cleanup (#2206)

Browse Source
This commit is contained in:
Xiliang Chen
2019-04-05 03:55:55 +13:00
committed by Gav Wood
parent acaf1fe625
commit cb7a8161f5
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/node/runtime/src/lib.rs
+4 -4
View File
@@ -129,7 +129,7 @@ impl session::Trait for Runtime {
} }
impl staking::Trait for Runtime { impl staking::Trait for Runtime {
type Currency = balances::Module<Self>; type Currency = Balances;
type CurrencyToVote = CurrencyToVoteHandler; type CurrencyToVote = CurrencyToVoteHandler;
type OnRewardMinted = Treasury; type OnRewardMinted = Treasury;
type Event = Event; type Event = Event;
@@ -138,7 +138,7 @@ impl staking::Trait for Runtime {
} }
impl democracy::Trait for Runtime { impl democracy::Trait for Runtime {
type Currency = balances::Module<Self>; type Currency = Balances;
type Proposal = Call; type Proposal = Call;
type Event = Event; type Event = Event;
} }
@@ -160,7 +160,7 @@ impl council::motions::Trait for Runtime {
} }
impl treasury::Trait for Runtime { impl treasury::Trait for Runtime {
type Currency = balances::Module<Self>; type Currency = Balances;
type ApproveOrigin = council_motions::EnsureMembers<_4>; type ApproveOrigin = council_motions::EnsureMembers<_4>;
type RejectOrigin = council_motions::EnsureMembers<_2>; type RejectOrigin = council_motions::EnsureMembers<_2>;
type Event = Event; type Event = Event;
@@ -169,7 +169,7 @@ impl treasury::Trait for Runtime {
} }
impl contract::Trait for Runtime { impl contract::Trait for Runtime {
type Currency = balances::Module<Runtime>; type Currency = Balances;
type Call = Call; type Call = Call;
type Event = Event; type Event = Event;
type Gas = u64; type Gas = u64;
substrate/srml/staking/src/lib.rs
+1 -3
View File
@@ -413,9 +413,7 @@ type NegativeImbalanceOf<T> = <<T as Trait>::Currency as Currency<<T as system::
pub trait Trait: system::Trait + session::Trait { pub trait Trait: system::Trait + session::Trait {
/// The staking balance. /// The staking balance.
type Currency: type Currency: LockableCurrency<Self::AccountId, Moment=Self::BlockNumber>;
Currency<Self::AccountId> +
LockableCurrency<Self::AccountId, Moment=Self::BlockNumber>;
/// Convert a balance into a number used for election calculation. /// Convert a balance into a number used for election calculation.
/// This must fit into a `u64` but is allowed to be sensibly lossy. /// This must fit into a `u64` but is allowed to be sensibly lossy.