Clean code (#328)

* Oracle updates from #310 (#324) * push oracle updates from #310 * update tests * manually revert #279 (#325) * apply needed changes from 279 (#326) * revert 312 (#327) * apply more changes from 310 * add missing file
opynfinance · Dec 28, 2020 · 856290c · 856290c
1 parent 7125c64
commit 856290c
Show file tree

Hide file tree

Showing 18 changed files with 82 additions and 1,305 deletions.
diff --git a/contracts/Oracle.sol b/contracts/Oracle.sol
@@ -146,10 +146,16 @@ contract Oracle is Ownable {
      * @return True if locking period is over, False if not
      */
     function isLockingPeriodOver(address _asset, uint256 _expiryTimestamp) public view returns (bool) {
-        address pricer = assetPricer[_asset];
-        uint256 lockingPeriod = pricerLockingPeriod[pricer];
+        uint256 price = stablePrice[_asset];
+
+        if (price == 0) {
+            address pricer = assetPricer[_asset];
+            uint256 lockingPeriod = pricerLockingPeriod[pricer];
+
+            return now > _expiryTimestamp.add(lockingPeriod);
+        }
 
-        return now > _expiryTimestamp.add(lockingPeriod);
+        return true;
     }
 
     /**
@@ -159,15 +165,22 @@ contract Oracle is Ownable {
      * @return True if dispute period is over, False if not
      */
     function isDisputePeriodOver(address _asset, uint256 _expiryTimestamp) public view returns (bool) {
-        // check if the pricer has a price for this expiry timestamp
-        Price memory price = storedPrice[_asset][_expiryTimestamp];
-        if (price.timestamp == 0) {
-            return false;
+        uint256 price = stablePrice[_asset];
+
+        if (price == 0) {
+            // check if the pricer has a price for this expiry timestamp
+            Price memory price = storedPrice[_asset][_expiryTimestamp];
+            if (price.timestamp == 0) {
+                return false;
+            }
+
+            address pricer = assetPricer[_asset];
+            uint256 disputePeriod = pricerDisputePeriod[pricer];
+
+            return now > price.timestamp.add(disputePeriod);
         }
 
-        address pricer = assetPricer[_asset];
-        uint256 disputePeriod = pricerDisputePeriod[pricer];
-        return now > price.timestamp.add(disputePeriod);
+        return true;
     }
 
     /**

diff --git a/contracts/external/callees/Trade0x.sol b/contracts/external/callees/Trade0x.sol
diff --git a/contracts/external/proxies/CERC20Proxy.sol b/contracts/external/proxies/CERC20Proxy.sol
diff --git a/contracts/interfaces/CERC20Interface.sol b/contracts/interfaces/CERC20Interface.sol
diff --git a/contracts/interfaces/CETHInterface.sol b/contracts/interfaces/CETHInterface.sol
diff --git a/contracts/interfaces/ZeroXExchangeInterface.sol b/contracts/interfaces/ZeroXExchangeInterface.sol
diff --git a/contracts/mocks/Mock0xERC20Proxy.sol b/contracts/mocks/Mock0xERC20Proxy.sol