33#![ cfg( test) ]
44
55use super :: * ;
6- use frame_support:: { assert_noop, assert_ok} ;
6+ use frame_support:: { assert_noop, assert_ok, traits :: Currency } ;
77use mock:: {
88 AccountId , AdaptedBasicCurrency , Currencies , ExtBuilder , NativeCurrency , Origin , PalletBalances , System , TestEvent ,
99 Tokens , ALICE , BOB , EVA , ID_1 , NATIVE_CURRENCY_ID , X_TOKEN_ID ,
1010} ;
11+ use orml_traits:: {
12+ BasicCurrency , BasicCurrencyExtended , BasicLockableCurrency , BasicReservableCurrency , MultiCurrency ,
13+ MultiCurrencyExtended , MultiLockableCurrency , MultiReservableCurrency ,
14+ } ;
1115use sp_runtime:: traits:: BadOrigin ;
1216
1317#[ test]
@@ -258,7 +262,7 @@ fn call_event_should_work() {
258262 assert_eq ! ( Currencies :: free_balance( X_TOKEN_ID , & ALICE ) , 50 ) ;
259263 assert_eq ! ( Currencies :: free_balance( X_TOKEN_ID , & BOB ) , 150 ) ;
260264
261- let transferred_event = TestEvent :: currencies ( RawEvent :: Transferred ( X_TOKEN_ID , ALICE , BOB , 50 ) ) ;
265+ let transferred_event = TestEvent :: currencies ( Event :: Transferred ( X_TOKEN_ID , ALICE , BOB , 50 ) ) ;
262266 assert ! ( System :: events( ) . iter( ) . any( |record| record. event == transferred_event) ) ;
263267
264268 assert_ok ! ( <Currencies as MultiCurrency <AccountId >>:: transfer(
@@ -267,23 +271,23 @@ fn call_event_should_work() {
267271 assert_eq ! ( Currencies :: free_balance( X_TOKEN_ID , & ALICE ) , 40 ) ;
268272 assert_eq ! ( Currencies :: free_balance( X_TOKEN_ID , & BOB ) , 160 ) ;
269273
270- let transferred_event = TestEvent :: currencies ( RawEvent :: Transferred ( X_TOKEN_ID , ALICE , BOB , 10 ) ) ;
274+ let transferred_event = TestEvent :: currencies ( Event :: Transferred ( X_TOKEN_ID , ALICE , BOB , 10 ) ) ;
271275 assert ! ( System :: events( ) . iter( ) . any( |record| record. event == transferred_event) ) ;
272276
273277 assert_ok ! ( <Currencies as MultiCurrency <AccountId >>:: deposit(
274278 X_TOKEN_ID , & ALICE , 100
275279 ) ) ;
276280 assert_eq ! ( Currencies :: free_balance( X_TOKEN_ID , & ALICE ) , 140 ) ;
277281
278- let transferred_event = TestEvent :: currencies ( RawEvent :: Deposited ( X_TOKEN_ID , ALICE , 100 ) ) ;
282+ let transferred_event = TestEvent :: currencies ( Event :: Deposited ( X_TOKEN_ID , ALICE , 100 ) ) ;
279283 assert ! ( System :: events( ) . iter( ) . any( |record| record. event == transferred_event) ) ;
280284
281285 assert_ok ! ( <Currencies as MultiCurrency <AccountId >>:: withdraw(
282286 X_TOKEN_ID , & ALICE , 20
283287 ) ) ;
284288 assert_eq ! ( Currencies :: free_balance( X_TOKEN_ID , & ALICE ) , 120 ) ;
285289
286- let transferred_event = TestEvent :: currencies ( RawEvent :: Withdrawn ( X_TOKEN_ID , ALICE , 20 ) ) ;
290+ let transferred_event = TestEvent :: currencies ( Event :: Withdrawn ( X_TOKEN_ID , ALICE , 20 ) ) ;
287291 assert ! ( System :: events( ) . iter( ) . any( |record| record. event == transferred_event) ) ;
288292 } ) ;
289293}
0 commit comments