Skip to content

Remove redundant trait bound #1931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xlc merged 1 commit into from
Mar 2, 2022
Merged

Remove redundant trait bound #1931

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
7 changes: 5 additions & 2 deletions modules/evm/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,11 @@ pub mod module {
type AddressMapping: AddressMapping<Self::AccountId>;

/// Currency type for withdraw and balance storage.
type Currency: Currency<Self::AccountId, Balance = Balance>
+ NamedReservableCurrency<Self::AccountId, ReserveIdentifier = ReserveIdentifier>;
type Currency: NamedReservableCurrency<
Self::AccountId,
ReserveIdentifier = ReserveIdentifier,
Balance = Balance,
>;

/// Merge free balance from source to dest.
type TransferAll: TransferAll<Self::AccountId>;
Expand Down
9 changes: 5 additions & 4 deletions modules/transaction-payment/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,11 @@ pub mod module {
type DefaultFeeSwapPathList: Get<Vec<Vec<CurrencyId>>>;

/// The currency type in which fees will be paid.
type Currency: Currency<Self::AccountId, Balance = Balance>
+ NamedReservableCurrency<Self::AccountId, ReserveIdentifier = ReserveIdentifier>
+ Send
+ Sync;
type Currency: NamedReservableCurrency<
Self::AccountId,
ReserveIdentifier = ReserveIdentifier,
Balance = Balance,
>;

/// Currency to transfer, reserve/unreserve, lock/unlock assets
type MultiCurrency: MultiCurrency<Self::AccountId, CurrencyId = CurrencyId, Balance = Balance>;
Expand Down