diff --git a/contracts/Marketplace.sol b/contracts/Marketplace.sol index 4f3fe34..1f84b30 100644 --- a/contracts/Marketplace.sol +++ b/contracts/Marketplace.sol @@ -478,19 +478,10 @@ contract Marketplace is SlotReservations, Proofs, StateRetrieval, Endian { function requestEnd(RequestId requestId) public view returns (Timestamp) { RequestState state = requestState(requestId); - if ( - state == RequestState.New || - state == RequestState.Started || - state == RequestState.Failed - ) { - return _requestContexts[requestId].endsAt; - } if (state == RequestState.Cancelled) { return _requestContexts[requestId].expiresAt; } - Timestamp currentTime = Timestamps.currentTime(); - Timestamp end = _requestContexts[requestId].endsAt; - return Timestamps.earliest(end, currentTime); + return _requestContexts[requestId].endsAt; } function requestExpiry(RequestId requestId) public view returns (Timestamp) { diff --git a/contracts/Timestamps.sol b/contracts/Timestamps.sol index 665eea5..945eced 100644 --- a/contracts/Timestamps.sol +++ b/contracts/Timestamps.sol @@ -67,16 +67,4 @@ library Timestamps { ) internal pure returns (Duration) { return Duration.wrap(Timestamp.unwrap(end) - Timestamp.unwrap(start)); } - - /// Returns the earliest of the two timestamps - function earliest( - Timestamp a, - Timestamp b - ) internal pure returns (Timestamp) { - if (a <= b) { - return a; - } else { - return b; - } - } }