Skip to content

Commit

Permalink
chore: remove commented line, uncomment snippet
Browse files Browse the repository at this point in the history
  • Loading branch information
xorsal committed Nov 5, 2024
1 parent 0f5367f commit 71c6b11
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,6 @@ contract BondEscalationResolutionModule is AccessControllerModule, IBondEscalati
InequalityData storage _inequalityData = inequalityData[_disputeId];
RequestParameters memory _params = decodeRequestData(_request.resolutionModuleData);

// uint256 _pledgingDeadline = _escalation.startTime + _params.timeUntilDeadline;

if (block.timestamp >= _escalation.startTime + _params.timeUntilDeadline) {
revert BondEscalationResolutionModule_PledgingPhaseOver();
}
Expand Down
22 changes: 11 additions & 11 deletions solidity/test/integration/Arbitration.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -132,20 +132,20 @@ contract Integration_Arbitration is IntegrationBase {
vm.prank(disputer);
oracle.escalateDispute(mockRequest, mockResponse, mockDispute, _createAccessControl(disputer));

// // Check: is the dispute status resolved after calling escalate?
// assertEq(uint256(_arbitratorModule.getStatus(_disputeId)), uint256(IArbitratorModule.ArbitrationStatus.Resolved));
// Check: is the dispute status resolved after calling escalate?
assertEq(uint256(_arbitratorModule.getStatus(_disputeId)), uint256(IArbitratorModule.ArbitrationStatus.Resolved));

// IOracle.DisputeStatus _disputeStatus = oracle.disputeStatus(_disputeId);
// // Check: is the dispute updated as lost?
// assertEq(uint256(_disputeStatus), uint256(IOracle.DisputeStatus.Lost));
IOracle.DisputeStatus _disputeStatus = oracle.disputeStatus(_disputeId);
// Check: is the dispute updated as lost?
assertEq(uint256(_disputeStatus), uint256(IOracle.DisputeStatus.Lost));

// // Check: does the disputer receive the disputer's bond?
// uint256 _proposerBalance = _accountingExtension.balanceOf(proposer, usdc);
// assertEq(_proposerBalance, _expectedBondSize * 2);
// Check: does the disputer receive the disputer's bond?
uint256 _proposerBalance = _accountingExtension.balanceOf(proposer, usdc);
assertEq(_proposerBalance, _expectedBondSize * 2);

// // Check: does the disputer get its bond slashed?
// uint256 _disputerBondedAmount = _accountingExtension.bondedAmountOf(disputer, usdc, _getId(mockRequest));
// assertEq(_disputerBondedAmount, 0);
// Check: does the disputer get its bond slashed?
uint256 _disputerBondedAmount = _accountingExtension.bondedAmountOf(disputer, usdc, _getId(mockRequest));
assertEq(_disputerBondedAmount, 0);
}

function _setArbitrator(address _arbitrator) internal {
Expand Down

0 comments on commit 71c6b11

Please sign in to comment.