@@ -39,7 +39,7 @@ contract GenericSwapTest is Test, Tokens, BalanceUtil, Permit2Helper, SigHelper
39
39
uint24 [] defaultV3Fees = [3000 ];
40
40
bytes defaultTakerPermit;
41
41
bytes alicePermit;
42
- bytes swapData ;
42
+ bytes strategyData ;
43
43
SmartOrderStrategy smartStrategy;
44
44
GenericSwap genericSwap;
45
45
GenericSwapData defaultGSData;
@@ -95,7 +95,7 @@ contract GenericSwapTest is Test, Tokens, BalanceUtil, Permit2Helper, SigHelper
95
95
value: 0 ,
96
96
data: routerPayload
97
97
});
98
- swapData = abi.encode (operations);
98
+ strategyData = abi.encode (operations);
99
99
100
100
deal (taker, 100 ether);
101
101
setTokenBalanceAndApprove (taker, UNISWAP_PERMIT2_ADDRESS, tokens, 100000 );
@@ -279,7 +279,7 @@ contract GenericSwapTest is Test, Tokens, BalanceUtil, Permit2Helper, SigHelper
279
279
function testCannotSwapWithInvalidETHInput () public {
280
280
// case1 : msg.value != 0 when takerToken is not ETH
281
281
vm.expectRevert (IGenericSwap.InvalidMsgValue.selector );
282
- genericSwap.executeSwap { value: 1 }(defaultGSData, swapData , defaultTakerPermit);
282
+ genericSwap.executeSwap { value: 1 }(defaultGSData, strategyData , defaultTakerPermit);
283
283
284
284
// change input token as ETH and update amount
285
285
GenericSwapData memory gsData = defaultGSData;
@@ -363,15 +363,15 @@ contract GenericSwapTest is Test, Tokens, BalanceUtil, Permit2Helper, SigHelper
363
363
364
364
vm.expectRevert (IGenericSwap.InvalidSignature.selector );
365
365
// submit with user address as expected signer
366
- genericSwap.executeSwapWithSig (defaultGSData, swapData , defaultTakerPermit, taker, randomSig);
366
+ genericSwap.executeSwapWithSig (defaultGSData, strategyData , defaultTakerPermit, taker, randomSig);
367
367
}
368
368
369
369
function testCannotReplayGenericSwapSig () public {
370
370
bytes memory takerSig = signGenericSwap (takerPrivateKey, defaultGSData, address (genericSwap));
371
- genericSwap.executeSwapWithSig (defaultGSData, swapData , defaultTakerPermit, taker, takerSig);
371
+ genericSwap.executeSwapWithSig (defaultGSData, strategyData , defaultTakerPermit, taker, takerSig);
372
372
373
373
vm.expectRevert (IGenericSwap.AlreadyFilled.selector );
374
- genericSwap.executeSwapWithSig (defaultGSData, swapData , defaultTakerPermit, taker, takerSig);
374
+ genericSwap.executeSwapWithSig (defaultGSData, strategyData , defaultTakerPermit, taker, takerSig);
375
375
}
376
376
377
377
function testLeaveOneWeiWithMultipleUsers () public {
@@ -434,7 +434,7 @@ contract GenericSwapTest is Test, Tokens, BalanceUtil, Permit2Helper, SigHelper
434
434
);
435
435
436
436
vm.startPrank (alice);
437
- genericSwap.executeSwap (aliceGSData, swapData , alicePermit);
437
+ genericSwap.executeSwap (aliceGSData, strategyData , alicePermit);
438
438
vm.stopPrank ();
439
439
vm.snapshotGasLastCall ("GenericSwap " , "executeSwap(): testLeaveOneWeiWithMultipleUsers(the second deposit) " );
440
440
0 commit comments