Skip to content

Commit

Permalink
Merge branch 'dev' into fix/dispute-lock
Browse files Browse the repository at this point in the history
  • Loading branch information
0xShaito authored Jul 9, 2024
2 parents 55afd31 + 00504ec commit 6e639d5
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions solidity/test/unit/modules/resolution/ArbitratorModule.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ contract ArbitratorModule_Unit_ModuleData is BaseTest {
* @notice Test that the status is correctly retrieved
*/
function test_getStatus(uint256 _status, bytes32 _disputeId) public {
_status = bound(_status, 0, uint256(IArbitratorModule.ArbitrationStatus.Resolved));
vm.assume(_status <= uint256(IArbitratorModule.ArbitrationStatus.Resolved));
IArbitratorModule.ArbitrationStatus _arbitratorStatus = IArbitratorModule.ArbitrationStatus(_status);

// Store the mock dispute
Expand Down Expand Up @@ -233,8 +233,7 @@ contract ArbitratorModule_Unit_ResolveDispute is BaseTest {
}

function test_emitsEvent(uint256 _status, address _arbitrator) public assumeFuzzable(_arbitrator) {
vm.assume(_status <= uint256(IOracle.DisputeStatus.Lost));
vm.assume(_status > uint256(IOracle.DisputeStatus.Escalated));
_status = bound(_status, uint256(IOracle.DisputeStatus.Escalated) + 1, uint256(IOracle.DisputeStatus.Lost));
IOracle.DisputeStatus _arbitratorStatus = IOracle.DisputeStatus(_status);

mockRequest.resolutionModuleData = abi.encode(_arbitrator);
Expand Down

0 comments on commit 6e639d5

Please sign in to comment.