Revert "Move LockableCurrency trait to fungibles::Lockable and deprecate LockableCurrency (#12798)" (#12882)

This reverts commit 9a014d1ecd.
This commit is contained in:
Anthony Alaribe authored and GitHub committed 2022-12-09 09:40:59 +00:00
1 parent 8a24e27377
commit 96902eae48
20 files changed
+105 -135

No files matched your search

+4 -6
View File
@@ -157,11 +157,9 @@ use frame_support::{
ensure,
traits::{
defensive_prelude::*,
fungibles,
fungibles::Lockable,
schedule::{v3::Named as ScheduleNamed, DispatchTime},
Bounded, Currency, Get, OnUnbalanced, QueryPreimage, ReservableCurrency, StorePreimage,
WithdrawReasons,
Bounded, Currency, Get, LockIdentifier, LockableCurrency, OnUnbalanced, QueryPreimage,
ReservableCurrency, StorePreimage, WithdrawReasons,
},
weights::Weight,
};
@@ -191,7 +189,7 @@ pub mod benchmarking;
pub mod migrations;
const DEMOCRACY_ID: fungibles::LockIdentifier = *b"democrac";
const DEMOCRACY_ID: LockIdentifier = *b"democrac";
/// A proposal index.
pub type PropIndex = u32;
@@ -236,7 +234,7 @@ pub mod pallet {
/// Currency type for this pallet.
type Currency: ReservableCurrency<Self::AccountId>
+ fungibles::Lockable<Self::AccountId, Moment = Self::BlockNumber>;
+ LockableCurrency<Self::AccountId, Moment = Self::BlockNumber>;
/// The period between a proposal being approved and enacted.
///