test: fix (most) unit tests

defi-wonderland · Nov 21, 2023 · 4cdfe06 · 4cdfe06
1 parent feede2c
commit 4cdfe06
Show file tree

Hide file tree

Showing 5 changed files with 522 additions and 381 deletions.
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     "package.json": "sort-package-json"
   },
   "dependencies": {
-    "@defi-wonderland/prophet-core-contracts": "0.0.0-d05a00d0",
+    "@defi-wonderland/prophet-core-contracts": "0.0.0-1ae08a81",
     "@defi-wonderland/solidity-utils": "0.0.0-3e9c8e8b",
     "@openzeppelin/contracts": "^4.9.3",
     "ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0",

diff --git a/solidity/contracts/modules/dispute/BondEscalationModule.sol b/solidity/contracts/modules/dispute/BondEscalationModule.sol
@@ -71,7 +71,6 @@ contract BondEscalationModule is Module, IBondEscalationModule {
     if (_escalation.status == BondEscalationStatus.None) {
       if (block.timestamp > _params.bondEscalationDeadline) revert BondEscalationModule_BondEscalationOver();
 
-      // Note: this imitates the way _disputeId is calculated on the Oracle, it must always match
       _escalation.status = BondEscalationStatus.Active;
       _escalation.disputeId = _disputeId;
       emit BondEscalationStatusUpdated(_dispute.requestId, _disputeId, BondEscalationStatus.Active);
@@ -85,6 +84,7 @@ contract BondEscalationModule is Module, IBondEscalationModule {
     });
 
     emit ResponseDisputed({
+      _requestId: _dispute.requestId,
       _responseId: _dispute.responseId,
       _disputeId: _disputeId,
       _dispute: _dispute,
@@ -164,11 +164,7 @@ contract BondEscalationModule is Module, IBondEscalationModule {
     }
 
     // TODO: Emit event
-    // emit DisputeStatusChanged({
-    //   _disputeId: _disputeId,
-    //   _dispute: _dispute,
-    //   _status: _status
-    // });
+    // emit DisputeStatusChanged({_disputeId: _disputeId, _dispute: _dispute, _status: _status});
   }
 
   ////////////////////////////////////////////////////////////////////
@@ -256,8 +252,6 @@ contract BondEscalationModule is Module, IBondEscalationModule {
     IOracle.Dispute calldata _dispute,
     bool _forDispute
   ) internal view returns (RequestParameters memory _params) {
-    if (_disputeId == 0) revert BondEscalationModule_DisputeDoesNotExist();
-
     BondEscalation memory _escalation = _escalations[_dispute.requestId];
 
     if (_disputeId != _escalation.disputeId) {