From 8a303c61950130a1a0b9aaae4a767b902aa00840 Mon Sep 17 00:00:00 2001
From: Gerardo Nardelli <gerardo.nardelli@altoros.com>
Date: Thu, 19 Nov 2020 16:39:00 -0300
Subject: [PATCH] Refactor repayMode in repayAdapter

---
 contracts/adapters/UniswapRepayAdapter.sol | 25 ++++++++++++++--------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/contracts/adapters/UniswapRepayAdapter.sol b/contracts/adapters/UniswapRepayAdapter.sol
index 2e09f746..d8461400 100644
--- a/contracts/adapters/UniswapRepayAdapter.sol
+++ b/contracts/adapters/UniswapRepayAdapter.sol
@@ -16,11 +16,18 @@ import {ReserveLogic} from '../libraries/logic/ReserveLogic.sol';
  **/
 contract UniswapRepayAdapter is BaseUniswapAdapter, IFlashLoanReceiver {
 
+  /*
+  * STANDARD: Use the provided amounts parameters
+  * ALL_DEBT: Repay the whole debt balance
+  * ALL_COLLATERAL: Use all the collateral balance to repay the max amount of debt
+  */
+  enum RepayMode {STANDARD, ALL_DEBT, ALL_COLLATERAL}
+
   struct RepayParams {
     address assetToSwapTo;
     uint256 repayAmount;
     uint256 rateMode;
-    bool repayAllDebt;
+    RepayMode repayMode;
     PermitSignature permitSignature;
   }
 
@@ -45,7 +52,7 @@ contract UniswapRepayAdapter is BaseUniswapAdapter, IFlashLoanReceiver {
    *   address Address of the reserve to be swapped to and repay
    *   uint256 repayAmount Amount of debt to be repaid
    *   uint256 rateMode Rate modes of the debt to be repaid
-   *   bool repayAllDebt Flag indicating if all the debt should be repaid
+   *   RepayMode repayMode Enum indicating the repaid mode
    *   uint256 permitAmount Amount for the permit signature
    *   uint256 deadline Deadline for the permit signature
    *   uint8 v V param for the permit signature
@@ -70,7 +77,7 @@ contract UniswapRepayAdapter is BaseUniswapAdapter, IFlashLoanReceiver {
         decodedParams.repayAmount,
         decodedParams.rateMode,
         initiator,
-        decodedParams.repayAllDebt,
+        decodedParams.repayMode,
         premiums[0],
         decodedParams.permitSignature
       );
@@ -97,13 +104,13 @@ contract UniswapRepayAdapter is BaseUniswapAdapter, IFlashLoanReceiver {
     uint256 repayAmount,
     uint256 rateMode,
     address initiator,
-    bool repayAllDebt,
+    RepayMode repayMode,
     uint256 premium,
     PermitSignature memory permitSignature
   ) internal {
     uint256 debtRepayAmount;
 
-    if (repayAllDebt) {
+    if (repayMode == RepayMode.ALL_DEBT) {
       ReserveLogic.ReserveData memory reserveDebtData = _getReserveData(assetTo);
 
       address debtToken = ReserveLogic.InterestRateMode(rateMode) == ReserveLogic.InterestRateMode.STABLE
@@ -137,7 +144,7 @@ contract UniswapRepayAdapter is BaseUniswapAdapter, IFlashLoanReceiver {
    *   address Address of the reserve to be swapped to and repay
    *   uint256 repayAmount Amount of debt to be repaid
    *   uint256 rateMode Rate modes of the debt to be repaid
-   *   bool repayAllDebt Flag indicating if all the debt should be repaid
+   *   RepayMode repayMode Enum indicating the repaid mode
    *   uint256 permitAmount Amount for the permit signature
    *   uint256 deadline Deadline for the permit signature
    *   uint8 v V param for the permit signature
@@ -150,19 +157,19 @@ contract UniswapRepayAdapter is BaseUniswapAdapter, IFlashLoanReceiver {
       address assetToSwapTo,
       uint256 repayAmount,
       uint256 rateMode,
-      bool repayAllDebt,
+      RepayMode repayMode,
       uint256 permitAmount,
       uint256 deadline,
       uint8 v,
       bytes32 r,
       bytes32 s
-    ) = abi.decode(params, (address, uint256, uint256, bool, uint256, uint256, uint8, bytes32, bytes32));
+    ) = abi.decode(params, (address, uint256, uint256, RepayMode, uint256, uint256, uint8, bytes32, bytes32));
 
     return RepayParams(
       assetToSwapTo,
       repayAmount,
       rateMode,
-      repayAllDebt,
+      repayMode,
       PermitSignature(
         permitAmount,
         deadline,