refactor: asset -> token in markets

morpho-org · Aug 11, 2023 · 60f917f · 60f917f
1 parent b15d37e
commit 60f917f
Show file tree

Hide file tree

Showing 4 changed files with 109 additions and 109 deletions.
diff --git a/src/Blue.sol b/src/Blue.sol
@@ -176,7 +176,7 @@ contract Blue is IBlue {
 
         if (data.length > 0) IBlueSupplyCallback(msg.sender).onBlueSupply(assets, data);
 
-        IERC20(market.borrowableAsset).safeTransferFrom(msg.sender, address(this), assets);
+        IERC20(market.borrowableToken).safeTransferFrom(msg.sender, address(this), assets);
     }
 
     /// @inheritdoc IBlue
@@ -203,7 +203,7 @@ contract Blue is IBlue {
 
         require(totalBorrow[id] <= totalSupply[id], ErrorsLib.INSUFFICIENT_LIQUIDITY);
 
-        IERC20(market.borrowableAsset).safeTransfer(receiver, assets);
+        IERC20(market.borrowableToken).safeTransfer(receiver, assets);
     }
 
     /* BORROW MANAGEMENT */
@@ -233,7 +233,7 @@ contract Blue is IBlue {
         require(_isHealthy(market, id, onBehalf), ErrorsLib.INSUFFICIENT_COLLATERAL);
         require(totalBorrow[id] <= totalSupply[id], ErrorsLib.INSUFFICIENT_LIQUIDITY);
 
-        IERC20(market.borrowableAsset).safeTransfer(receiver, assets);
+        IERC20(market.borrowableToken).safeTransfer(receiver, assets);
     }
 
     /// @inheritdoc IBlue
@@ -258,7 +258,7 @@ contract Blue is IBlue {
 
         if (data.length > 0) IBlueRepayCallback(msg.sender).onBlueRepay(assets, data);
 
-        IERC20(market.borrowableAsset).safeTransferFrom(msg.sender, address(this), assets);
+        IERC20(market.borrowableToken).safeTransferFrom(msg.sender, address(this), assets);
     }
 
     /* COLLATERAL MANAGEMENT */
@@ -278,7 +278,7 @@ contract Blue is IBlue {
 
         if (data.length > 0) IBlueSupplyCollateralCallback(msg.sender).onBlueSupplyCollateral(assets, data);
 
-        IERC20(market.collateralAsset).safeTransferFrom(msg.sender, address(this), assets);
+        IERC20(market.collateralToken).safeTransferFrom(msg.sender, address(this), assets);
     }
 
     /// @inheritdoc IBlue
@@ -298,7 +298,7 @@ contract Blue is IBlue {
 
         require(_isHealthy(market, id, onBehalf), ErrorsLib.INSUFFICIENT_COLLATERAL);
 
-        IERC20(market.collateralAsset).safeTransfer(receiver, assets);
+        IERC20(market.collateralToken).safeTransfer(receiver, assets);
     }
 
     /* LIQUIDATION */
@@ -337,13 +337,13 @@ contract Blue is IBlue {
             borrowShares[id][borrower] = 0;
         }
 
-        IERC20(market.collateralAsset).safeTransfer(msg.sender, seized);
+        IERC20(market.collateralToken).safeTransfer(msg.sender, seized);
 
         emit EventsLib.Liquidate(id, msg.sender, borrower, repaid, repaidShares, seized, badDebtShares);
 
         if (data.length > 0) IBlueLiquidateCallback(msg.sender).onBlueLiquidate(repaid, data);
 
-        IERC20(market.borrowableAsset).safeTransferFrom(msg.sender, address(this), repaid);
+        IERC20(market.borrowableToken).safeTransferFrom(msg.sender, address(this), repaid);
     }
 
     /* FLASH LOANS */

diff --git a/src/interfaces/IBlue.sol b/src/interfaces/IBlue.sol
@@ -6,14 +6,14 @@ import {IFlashLender} from "./IFlashLender.sol";
 type Id is bytes32;
 
 /// @notice Contains the parameters defining market.
-/// @param borrowableAsset The address of the borrowable asset.
-/// @param collateralAsset The address of the collateral asset.
+/// @param borrowableToken The address of the borrowable token.
+/// @param collateralToken The address of the collateral token.
 /// @param oracle The address of the oracle.
 /// @param irm The address of the interest rate model.
 /// @param lltv The Liquidation LTV.
 struct Market {
-    address borrowableAsset;
-    address collateralAsset;
+    address borrowableToken;
+    address collateralToken;
     address oracle;
     address irm;
     uint256 lltv;