Skip to content

Commit 15d50c7

Browse files
committed
marketplace: simplify requestEnd()
1 parent 8a11e87 commit 15d50c7

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

contracts/Marketplace.sol

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -464,19 +464,10 @@ contract Marketplace is SlotReservations, Proofs, StateRetrieval, Endian {
464464

465465
function requestEnd(RequestId requestId) public view returns (Timestamp) {
466466
RequestState state = requestState(requestId);
467-
if (
468-
state == RequestState.New ||
469-
state == RequestState.Started ||
470-
state == RequestState.Failed
471-
) {
472-
return _requestContexts[requestId].endsAt;
473-
}
474467
if (state == RequestState.Cancelled) {
475468
return _requestContexts[requestId].expiresAt;
476469
}
477-
Timestamp currentTime = Timestamps.currentTime();
478-
Timestamp end = _requestContexts[requestId].endsAt;
479-
return Timestamps.earliest(end, currentTime);
470+
return _requestContexts[requestId].endsAt;
480471
}
481472

482473
function requestExpiry(RequestId requestId) public view returns (Timestamp) {

0 commit comments

Comments
 (0)