test: oracle unit tests (#217)

defi-wonderland · Oct 4, 2023 · 42374ba · 42374ba
1 parent bacc238
commit 42374ba
Show file tree

Hide file tree

Showing 3 changed files with 628 additions and 508 deletions.
diff --git a/solidity/contracts/Oracle.sol b/solidity/contracts/Oracle.sol
@@ -102,12 +102,15 @@ contract Oracle is IOracle {
 
   /// @inheritdoc IOracle
   function listRequestIds(uint256 _startFrom, uint256 _batchSize) external view returns (bytes32[] memory _list) {
-    if (_batchSize > totalRequestCount) {
+    uint256 _totalRequestsCount = totalRequestCount;
+
+    // If trying to collect non-existent ids only, return empty array
+    if (_startFrom > _totalRequestsCount) {
       return _list;
     }
 
-    if (_batchSize > totalRequestCount - _startFrom) {
-      _batchSize = totalRequestCount - _startFrom;
+    if (_batchSize > _totalRequestsCount - _startFrom) {
+      _batchSize = _totalRequestsCount - _startFrom;
     }
 
     _list = new bytes32[](_batchSize);
@@ -378,7 +381,7 @@ contract Oracle is IOracle {
         DisputeStatus _disputeStatus = _disputes[_disputeId].status;
 
         if (_disputeStatus != DisputeStatus.None && _disputeStatus != DisputeStatus.Lost) {
-          revert Oracle_InvalidFinalizedResponse(_requestId);
+          revert Oracle_InvalidFinalizedResponse(_responseId);
         }
 
         unchecked {

diff --git a/solidity/test/integration/EscalateDispute.t.sol b/solidity/test/integration/EscalateDispute.t.sol
@@ -47,10 +47,6 @@ contract Integration_EscalateDispute is IntegrationBase {
     IOracle.Dispute memory _dispute = oracle.getDispute(_disputeId);
     assertTrue(_dispute.status == IOracle.DisputeStatus.Escalated);
 
-    /// TODO: The MockDisputeModule should now have the escalation status escalated
-    // IMockDisputeModule.BondEscalation memory _bondEscalation = _disputeModule.getEscalation(_requestId);
-    // assertTrue(_bondEscalation.status == IMockDisputeModule.BondEscalationStatus.Escalated);
-
     /// Escalate dispute reverts if dispute is not active
     vm.expectRevert(abi.encodeWithSelector(IOracle.Oracle_CannotEscalate.selector, _disputeId));
     oracle.escalateDispute(_disputeId);