fix test

storyprotocol · Feb 17, 2024 · e3918a8 · e3918a8
1 parent 479391a
commit e3918a8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/contracts/modules/dispute-module/DisputeModule.sol b/contracts/modules/dispute-module/DisputeModule.sol
@@ -226,8 +226,9 @@ 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 || dispute.currentTag == bytes32(0)) revert Errors.DisputeModule__NotAbleToResolve();
+
  if (msg.sender != dispute.disputeInitiator) revert Errors.DisputeModule__NotDisputeInitiator();
+ if (dispute.currentTag == IN_DISPUTE || dispute.currentTag == bytes32(0)) revert Errors.DisputeModule__NotAbleToResolve();
 
  successfulDisputesPerIp[dispute.targetIpId]--;
  disputes[_disputeId].currentTag = bytes32(0);

diff --git a/test/foundry/modules/dispute/DisputeModule.t.sol b/test/foundry/modules/dispute/DisputeModule.t.sol
@@ -478,10 +478,6 @@ contract DisputeModuleTest is BaseTest {
  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 {
@@ -510,6 +506,11 @@ contract DisputeModuleTest is BaseTest {
  assertEq(currentTagBeforeResolve, bytes32("PLAGIARISM"));
  assertEq(currentTagAfterResolve, bytes32(0));
  assertFalse(disputeModule.isIpTagged(ipAddr));
+
+ // Cant resolve again
+ vm.expectRevert(Errors.DisputeModule__NotAbleToResolve.selector);
+ disputeModule.resolveDispute(1);
+ vm.stopPrank();
  }
 
  function test_DisputeModule_name() public {