Merge branch 'main' into refactor/cleanup-post-c4

maple-labs · Dec 13, 2021 · 7cbbaa3 · 7cbbaa3
2 parents 2335498 + bdc437f
commit 7cbbaa3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/contracts/DebtLocker.sol b/contracts/DebtLocker.sol
@@ -85,8 +85,8 @@ contract DebtLocker is IDebtLocker, DebtLockerStorage, MapleProxied {
     }
 
     function setAllowedSlippage(uint256 allowedSlippage_) external override whenProtocolNotPaused {
-        require(msg.sender == _getPoolDelegate(),   "DL:SAS:NOT_PD");
-        require(allowedSlippage_ <= uint256(10000), "DL:SAS:INVALID_SLIPPAGE");
+        require(msg.sender == _getPoolDelegate(),    "DL:SAS:NOT_PD");
+        require(allowedSlippage_ <= uint256(10_000), "DL:SAS:INVALID_SLIPPAGE");
 
         emit AllowedSlippageSet(_allowedSlippage = allowedSlippage_);
     }

diff --git a/contracts/test/DebtLocker.t.sol b/contracts/test/DebtLocker.t.sol
@@ -735,8 +735,8 @@ contract DebtLockerTests is TestUtils {
 
         DebtLocker debtLocker = DebtLocker(pool.createDebtLocker(address(dlFactory), address(loan)));
 
-        assertTrue(!poolDelegate.try_debtLocker_setAllowedSlippage(address(debtLocker), 10001));
-        assertTrue( poolDelegate.try_debtLocker_setAllowedSlippage(address(debtLocker), 10000));
+        assertTrue(!poolDelegate.try_debtLocker_setAllowedSlippage(address(debtLocker), 10_001));
+        assertTrue( poolDelegate.try_debtLocker_setAllowedSlippage(address(debtLocker), 10_000));
     }
 
     /***********************/

diff --git a/modules/liquidations b/modules/liquidations
diff --git a/modules/loan b/modules/loan
diff --git a/modules/maple-proxy-factory b/modules/maple-proxy-factory
+2 −2		contracts/MapleProxyFactory.sol
+2 −0		contracts/test/MapleProxyFactory.t.sol
+1 −1		modules/proxy-factory