Changed structure of buy feature in MockParaswap to match with sell feature

Author: sameepsi

contracts/mocks/swap/MockParaSwapAugustus.sol

@@ -87,8 +87,8 @@ contract MockParaSwapAugustus is IParaSwapAugustus {
     require(fromToken == _expectedFromToken, 'Unexpected from token');
     require(toToken == _expectedToToken, 'Unexpected to token');
     require(toAmount >= _expectedToAmountMin && toAmount <= _expectedToAmountMax, 'To amount out of range');
-    require(_fromAmount >= fromAmount, 'From amount of tokens are higher than expected');
-    TOKEN_TRANSFER_PROXY.transferFrom(fromToken, msg.sender, address(this), fromAmount);
+    require(_fromAmount <= fromAmount, 'From amount of tokens are higher than expected');
+    TOKEN_TRANSFER_PROXY.transferFrom(fromToken, msg.sender, address(this), _fromAmount);
     MintableERC20(toToken).mint(toAmount);
     IERC20(toToken).transfer(msg.sender, toAmount);
     _expectingSwap = false;

test-suites/test-aave/paraswapAdapters.repay.spec.ts

@@ -670,19 +670,18 @@ makeSuite('Paraswap adapters', (testEnv: TestEnv) => {
         const amountToRepay = new BigNumber(expectedDaiAmount.toString())
         .multipliedBy(1.1)
         .toFixed(0);
+        const liquidityToSwap = await convertToCurrencyDecimals(weth.address, '10.8');
+        await mockAugustus.expectBuy(weth.address, dai.address, liquidityToSwap, expectedDaiAmount, amountToRepay);
+        
+        const mockAugustusCalldata = mockAugustus.interface.encodeFunctionData(
+          'buy',
+          [weth.address, dai.address, flashLoanAmount, expectedDaiAmount]
+        );
 
-          await mockAugustus.expectBuy(weth.address, dai.address, flashLoanAmount, expectedDaiAmount, amountToRepay);
-          const liquidityToSwap = await convertToCurrencyDecimals(weth.address, '10.8');
-
-          const mockAugustusCalldata = mockAugustus.interface.encodeFunctionData(
-            'buy',
-            [weth.address, dai.address, liquidityToSwap, expectedDaiAmount]
-          );
-  
-          const flashloanPremium = flashLoanAmount.mul(9).div(10000);
-          const flashloanTotal = flashLoanAmount.add(flashloanPremium);
-          await aWETH.connect(user).approve(paraswapRepayAdapter.address, flashloanTotal);
-          const userAEthBalanceBefore = await aWETH.balanceOf(userAddress);
+        const flashloanPremium = flashLoanAmount.mul(9).div(10000);
+        const flashloanTotal = flashLoanAmount.add(flashloanPremium);
+        await aWETH.connect(user).approve(paraswapRepayAdapter.address, flashloanTotal);
+        const userAEthBalanceBefore = await aWETH.balanceOf(userAddress);
 
 
         // Add a % to repay on top of the debt
@@ -772,10 +771,10 @@ makeSuite('Paraswap adapters', (testEnv: TestEnv) => {
         .multipliedBy(1.1)
         .toFixed(0);
 
-        await mockAugustus.expectBuy(weth.address, dai.address, flashLoanAmount, expectedDaiAmount, amountToRepay);
+        await mockAugustus.expectBuy(weth.address, dai.address, liquidityToSwap, expectedDaiAmount, amountToRepay);
         const mockAugustusCalldata = mockAugustus.interface.encodeFunctionData(
           'buy',
-          [weth.address, dai.address, liquidityToSwap, expectedDaiAmount]
+          [weth.address, dai.address, flashLoanAmount, expectedDaiAmount]
         );
 
         const flashloanPremium = flashLoanAmount.mul(9).div(10000);