Harmonize callbacks interfaces (250)

src/Blue.sol

@@ -309,7 +309,7 @@ contract Blue is IBlue {
 
         emit Liquidate(id, msg.sender, borrower, repaid, repaidShares, seized, badDebtShares);
 
-        if (data.length > 0) IBlueLiquidateCallback(msg.sender).onBlueLiquidate(seized, repaid, data);
+        if (data.length > 0) IBlueLiquidateCallback(msg.sender).onBlueLiquidate(repaid, data);
 
         IERC20(market.borrowableAsset).safeTransferFrom(msg.sender, address(this), repaid);
     }
@@ -321,7 +321,7 @@ contract Blue is IBlue {
 
         emit FlashLoan(msg.sender, token, amount);
 
-        IBlueFlashLoanCallback(msg.sender).onBlueFlashLoan(token, amount, data);
+        IBlueFlashLoanCallback(msg.sender).onBlueFlashLoan(amount, data);
 
         IERC20(token).safeTransferFrom(msg.sender, address(this), amount);
     }

src/interfaces/IBlueCallbacks.sol

@@ -2,7 +2,7 @@
 pragma solidity >=0.5.0;
 
 interface IBlueLiquidateCallback {
-    function onBlueLiquidate(uint256 seized, uint256 repaid, bytes calldata data) external;
+    function onBlueLiquidate(uint256 amount, bytes calldata data) external;
 }
 
 interface IBlueRepayCallback {
@@ -18,5 +18,5 @@ interface IBlueSupplyCollateralCallback {
 }
 
 interface IBlueFlashLoanCallback {
-    function onBlueFlashLoan(address token, uint256 amount, bytes calldata data) external;
+    function onBlueFlashLoan(uint256 amount, bytes calldata data) external;
 }

src/mocks/FlashBorrowerMock.sol

@@ -19,8 +19,9 @@ contract FlashBorrowerMock is IBlueFlashLoanCallback {
         BLUE.flashLoan(token, amount, data);
     }
 
-    function onBlueFlashLoan(address token, uint256 amount, bytes calldata) external {
+    function onBlueFlashLoan(uint256 amount, bytes calldata data) external {
         require(msg.sender == address(BLUE));
+        address token = abi.decode(data, (address));
         ERC20(token).safeApprove(address(BLUE), amount);
     }
 }

test/forge/Blue.t.sol

@@ -976,7 +976,7 @@ contract BlueTest is
         }
     }
 
-    function onBlueLiquidate(uint256, uint256 repaid, bytes memory data) external {
+    function onBlueLiquidate(uint256 repaid, bytes memory data) external {
         require(msg.sender == address(blue));
         bytes4 selector;
         (selector, data) = abi.decode(data, (bytes4, bytes));
@@ -985,8 +985,8 @@ contract BlueTest is
         }
     }
 
-    function onBlueFlashLoan(address token, uint256 amount, bytes calldata) external {
-        ERC20(token).approve(address(blue), amount);
+    function onBlueFlashLoan(uint256 amount, bytes calldata) external {
+        borrowableAsset.approve(address(blue), amount);
     }
 }
 

test/hardhat/Blue.spec.ts

@@ -224,6 +224,7 @@ describe("Blue", () => {
 
     await blue.connect(user).supply(market, amount, user.address, "0x");
 
-    await flashBorrower.flashLoan(borrowable.address, amount.div(2), []);
+    const data = defaultAbiCoder.encode(["address"], [borrowable.address]);
+    await flashBorrower.flashLoan(borrowable.address, amount.div(2), data);
   });
 });