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

code cleanup #2206

Merged
gavofyork merged 1 commit into from
Apr 4, 2019
Merged

code cleanup #2206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions node/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ impl session::Trait for Runtime {
}

impl staking::Trait for Runtime {
type Currency = balances::Module<Self>;
type Currency = Balances;
type CurrencyToVote = CurrencyToVoteHandler;
type OnRewardMinted = Treasury;
type Event = Event;
Expand All @@ -138,7 +138,7 @@ impl staking::Trait for Runtime {
}

impl democracy::Trait for Runtime {
type Currency = balances::Module<Self>;
type Currency = Balances;
type Proposal = Call;
type Event = Event;
}
Expand All @@ -160,7 +160,7 @@ impl council::motions::Trait for Runtime {
}

impl treasury::Trait for Runtime {
type Currency = balances::Module<Self>;
type Currency = Balances;
type ApproveOrigin = council_motions::EnsureMembers<_4>;
type RejectOrigin = council_motions::EnsureMembers<_2>;
type Event = Event;
Expand All @@ -169,7 +169,7 @@ impl treasury::Trait for Runtime {
}

impl contract::Trait for Runtime {
type Currency = balances::Module<Runtime>;
type Currency = Balances;
type Call = Call;
type Event = Event;
type Gas = u64;
Expand Down
4 changes: 1 addition & 3 deletions srml/staking/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,9 +413,7 @@ type NegativeImbalanceOf<T> = <<T as Trait>::Currency as Currency<<T as system::

pub trait Trait: system::Trait + session::Trait {
/// The staking balance.
type Currency:
Currency<Self::AccountId> +
LockableCurrency<Self::AccountId, Moment=Self::BlockNumber>;
type Currency: LockableCurrency<Self::AccountId, Moment=Self::BlockNumber>;

/// Convert a balance into a number used for election calculation.
/// This must fit into a `u64` but is allowed to be sensibly lossy.
Expand Down