added check to not decrement dispute counter on resolved disputes

storyprotocol · Feb 16, 2024 · 3bcab65 · 3bcab65
1 parent add40cd
commit 3bcab65
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/contracts/modules/dispute-module/DisputeModule.sol b/contracts/modules/dispute-module/DisputeModule.sol
@@ -226,8 +226,7 @@ contract DisputeModule is IDisputeModule, BaseModule, Governable, ReentrancyGuar
     /// @param _disputeId The dispute id
     function resolveDispute(uint256 _disputeId) external {
         Dispute memory dispute = disputes[_disputeId];
-
-        if (dispute.currentTag == IN_DISPUTE) revert Errors.DisputeModule__NotAbleToResolve();
+        if (dispute.currentTag == IN_DISPUTE || dispute.currentTag == bytes32(0)) revert Errors.DisputeModule__NotAbleToResolve();
         if (msg.sender != dispute.disputeInitiator) revert Errors.DisputeModule__NotDisputeInitiator();
 
         successfulDisputesPerIp[dispute.targetIpId]--;

diff --git a/test/foundry/modules/dispute/DisputeModule.t.sol b/test/foundry/modules/dispute/DisputeModule.t.sol
@@ -477,6 +477,11 @@ contract DisputeModuleTest is BaseTest {
         vm.startPrank(ipAccount1);
         vm.expectRevert(Errors.DisputeModule__NotAbleToResolve.selector);
         disputeModule.resolveDispute(1);
+
+        // Also if the dispute is already resolved or non-existent
+        vm.startPrank(ipAccount1);
+        vm.expectRevert(Errors.DisputeModule__NotAbleToResolve.selector);
+        disputeModule.resolveDispute(2);
     }
 
     function test_DisputeModule_resolveDispute() public {