feat: apply suggestions

morpho-org · Sep 18, 2023 · 4cd441a · 4cd441a
1 parent c2a78e7
commit 4cd441a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/src/MetaMorpho.sol b/src/MetaMorpho.sol
@@ -336,7 +336,7 @@ contract MetaMorpho is ERC4626, Ownable2Step, IMetaMorpho {
         // slither-disable-next-line reentrancy-no-eth
         SafeERC20.safeTransferFrom(IERC20(asset()), caller, address(this), assets);
 
-        require(_depositOrder(assets) == 0, ErrorsLib.DEPOSIT_ORDER_FAILED);
+        _depositOrder(assets);
 
         _mint(owner, shares);
 
@@ -492,7 +492,7 @@ contract MetaMorpho is ERC4626, Ownable2Step, IMetaMorpho {
         return assets;
     }
 
-    function _withdrawIdle(uint256 assets) internal view returns (uint256 newAssets, uint256 newIdle) {
+    function _withdrawIdle(uint256 assets) internal view returns (uint256 remaining, uint256 newIdle) {
         if (assets > idle) return (assets - idle, 0);
         return (0, idle - assets);
     }

diff --git a/src/libraries/ErrorsLib.sol b/src/libraries/ErrorsLib.sol
@@ -26,8 +26,6 @@ library ErrorsLib {
 
     string internal constant MARKET_NOT_ENABLED = "market not enabled";
 
-    string internal constant DEPOSIT_ORDER_FAILED = "deposit order failed";
-
     string internal constant WITHDRAW_ORDER_FAILED = "withdraw order failed";
 
     string internal constant MARKET_NOT_CREATED = "market not created";

diff --git a/test/forge/helpers/BaseTest.sol b/test/forge/helpers/BaseTest.sol
@@ -33,11 +33,7 @@ contract BaseTest is Test {
     uint256 internal constant MAX_TEST_LLTV = 0.99 ether;
     uint256 internal constant NB_MARKETS = 10;
     uint256 internal constant TIMELOCK = 0;
-    uint256 internal constant LLTV = 0.8 ether;
     uint128 internal constant CAP = type(uint128).max;
-    uint256 internal constant MAX_COLLATERAL_PRICE = 1e40;
-    uint256 internal constant MAX_COLLATERAL_ASSETS = type(uint128).max;
-    uint256 internal constant NB_OF_MARKETS = 10;
 
     address internal OWNER;
     address internal SUPPLIER;