test(medusa): fix compilation after merge

defi-wonderland · Nov 27, 2024 · 23dff81 · 23dff81
1 parent 3730d59
commit 23dff81
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/test/invariants/handlers/BaseHandler.t.sol b/test/invariants/handlers/BaseHandler.t.sol
@@ -23,7 +23,7 @@ contract BaseHandler is Setup, Actors {
   mapping(bytes32 _responseId => bool _isFinalized) internal _ghost_finalizedResponses;
 
   // Track disputes
-  mapping(bytes32 _response => bytes32[] _disputeIds) internal _ghost_disputes; // requestId => disputeIds
+  mapping(bytes32 _requestId => bytes32[] _disputeIds) internal _ghost_disputes; // requestId => disputeIds
   mapping(bytes32 _disputeId => IOracle.Dispute _data) internal _ghost_disputeData;
   mapping(bytes32 _disputeId => bool _escalated) internal _ghost_escalatedDisputes;
 

diff --git a/test/invariants/helpers/Utils.t.sol b/test/invariants/helpers/Utils.t.sol
@@ -89,12 +89,12 @@ contract Utils {
     }
   }
 
-  function assertEq(bytes32 a, bytes32 b) internal {
-    assertEq(a, b, 'assertEq: a != b');
+  function assertNotEq(address a, address b) internal {
+    assertNotEq(a, b, 'assertNotEq: a == b');
   }
 
-  function assertEq(bytes32 a, bytes32 b, string memory reason) internal {
-    if (a != b) {
+  function assertNotEq(address a, address b, string memory reason) internal {
+    if (a == b) {
       emit TestFailure(reason);
       assert(false);
     }
@@ -139,17 +139,6 @@ contract Utils {
     }
   }
 
-  function assertNotEq(address a, address b) internal {
-    assertNotEq(a, b, 'assertNotEq: a == b');
-  }
-
-  function assertNotEq(address a, address b, string memory reason) internal {
-    if (a == b) {
-      emit TestFailure(reason);
-      assert(false);
-    }
-  }
-
   function assertNotEq(bytes memory a, bytes memory b) internal {
     assertNotEq(a, b, 'assertNotEq: a == b');
   }