@@ -175,7 +175,8 @@ contract("DefaultMessageReceiver - direct interaction", async (accounts) => {
175
175
assert . equal ( await Helpers . getTokenBalance ( ERC20MintableInstance , DefaultMessageReceiverInstance . address ) , 0n ) ;
176
176
} ) ;
177
177
178
- it ( "should return full native token balance if contract balance increased during handling and actions reverted" , async ( ) => {
178
+ it ( "should return full native token balance if contract balance increased during handling and actions reverted" ,
179
+ async ( ) => {
179
180
const actions = [ {
180
181
nativeValue : 100 ,
181
182
callTo : TestForwarderInstance . address ,
@@ -290,15 +291,21 @@ contract("DefaultMessageReceiver - direct interaction", async (accounts) => {
290
291
291
292
it ( "should give approval to the approveTo then revoke it" , async ( ) => {
292
293
// DMR -> TestForwarder.execute -> TestForwarder2.execute -> Token.transferFrom(DMR, admin)
293
- const transferFrom = ( await ERC20MintableInstance . transferFrom . request ( DefaultMessageReceiverInstance . address , adminAddress , 33 ) ) . data ;
294
- const transferFromExecute = ( await TestForwarderInstance2 . execute . request ( transferFrom , ERC20MintableInstance . address , ZERO_ADDRESS ) ) . data ;
294
+ const transferFrom = ( await ERC20MintableInstance . transferFrom . request (
295
+ DefaultMessageReceiverInstance . address , adminAddress , 33 )
296
+ ) . data ;
297
+ const transferFromExecute = ( await TestForwarderInstance2 . execute . request (
298
+ transferFrom , ERC20MintableInstance . address , ZERO_ADDRESS )
299
+ ) . data ;
295
300
const actions = [ {
296
301
nativeValue : 0 ,
297
302
callTo : TestForwarderInstance . address ,
298
303
approveTo : TestForwarderInstance2 . address ,
299
304
tokenSend : ERC20MintableInstance . address ,
300
305
tokenReceive : ZERO_ADDRESS ,
301
- data : ( await TestForwarderInstance . execute . request ( transferFromExecute , TestForwarderInstance2 . address , ZERO_ADDRESS ) ) . data ,
306
+ data : ( await TestForwarderInstance . execute . request (
307
+ transferFromExecute , TestForwarderInstance2 . address , ZERO_ADDRESS )
308
+ ) . data ,
302
309
} ] ;
303
310
await ERC20MintableInstance . mint ( DefaultMessageReceiverInstance . address , 333 ) ;
304
311
const message = Helpers . createMessageCallData (
@@ -327,8 +334,12 @@ contract("DefaultMessageReceiver - direct interaction", async (accounts) => {
327
334
event . amount . toNumber ( ) === 333
328
335
) ;
329
336
} ) ;
330
- assert . equal ( await ERC20MintableInstance . allowance ( DefaultMessageReceiverInstance . address , TestForwarderInstance2 . address ) , 0n ) ;
331
- assert . equal ( await ERC20MintableInstance . allowance ( DefaultMessageReceiverInstance . address , TestForwarderInstance . address ) , 0n ) ;
337
+ assert . equal ( await ERC20MintableInstance . allowance (
338
+ DefaultMessageReceiverInstance . address , TestForwarderInstance2 . address ) ,
339
+ 0n ) ;
340
+ assert . equal ( await ERC20MintableInstance . allowance (
341
+ DefaultMessageReceiverInstance . address , TestForwarderInstance . address ) ,
342
+ 0n ) ;
332
343
} ) ;
333
344
334
345
it ( "should revert if callTo is EOA and data is not empty" , async ( ) => {
@@ -437,15 +448,21 @@ contract("DefaultMessageReceiver - direct interaction", async (accounts) => {
437
448
438
449
it ( "should revert if has too little gas after actions" , async ( ) => {
439
450
// DMR -> TestForwarder.execute -> TestForwarder2.execute -> Token.transferFrom(DMR, admin)
440
- const transferFrom = ( await ERC20MintableInstance . transferFrom . request ( DefaultMessageReceiverInstance . address , adminAddress , 33 ) ) . data ;
441
- const transferFromExecute = ( await TestForwarderInstance2 . execute . request ( transferFrom , ERC20MintableInstance . address , ZERO_ADDRESS ) ) . data ;
451
+ const transferFrom = ( await ERC20MintableInstance . transferFrom . request (
452
+ DefaultMessageReceiverInstance . address , adminAddress , 33 )
453
+ ) . data ;
454
+ const transferFromExecute = ( await TestForwarderInstance2 . execute . request (
455
+ transferFrom , ERC20MintableInstance . address , ZERO_ADDRESS )
456
+ ) . data ;
442
457
const actions = [ {
443
458
nativeValue : 0 ,
444
459
callTo : TestForwarderInstance . address ,
445
460
approveTo : TestForwarderInstance2 . address ,
446
461
tokenSend : ERC20MintableInstance . address ,
447
462
tokenReceive : ZERO_ADDRESS ,
448
- data : ( await TestForwarderInstance . execute . request ( transferFromExecute , TestForwarderInstance2 . address , ZERO_ADDRESS ) ) . data ,
463
+ data : ( await TestForwarderInstance . execute . request (
464
+ transferFromExecute , TestForwarderInstance2 . address , ZERO_ADDRESS )
465
+ ) . data ,
449
466
} ] ;
450
467
await ERC20MintableInstance . mint ( DefaultMessageReceiverInstance . address , 333 ) ;
451
468
const message = Helpers . createMessageCallData (
@@ -474,14 +491,18 @@ contract("DefaultMessageReceiver - direct interaction", async (accounts) => {
474
491
approveTo : ZERO_ADDRESS ,
475
492
tokenSend : ZERO_ADDRESS ,
476
493
tokenReceive : ZERO_ADDRESS ,
477
- data : ( await DefaultMessageReceiverInstance . transferBalanceAction . request ( ZERO_ADDRESS , relayer1Address ) ) . data ,
494
+ data : ( await DefaultMessageReceiverInstance . transferBalanceAction . request (
495
+ ZERO_ADDRESS , relayer1Address )
496
+ ) . data ,
478
497
} , {
479
498
nativeValue : 0 ,
480
499
callTo : DefaultMessageReceiverInstance . address ,
481
500
approveTo : ZERO_ADDRESS ,
482
501
tokenSend : ZERO_ADDRESS ,
483
502
tokenReceive : ZERO_ADDRESS ,
484
- data : ( await DefaultMessageReceiverInstance . transferBalanceAction . request ( ERC20MintableInstance . address , relayer1Address ) ) . data ,
503
+ data : ( await DefaultMessageReceiverInstance . transferBalanceAction . request (
504
+ ERC20MintableInstance . address , relayer1Address )
505
+ ) . data ,
485
506
} ] ;
486
507
const message = Helpers . createMessageCallData (
487
508
transactionId ,
0 commit comments