chore: fix conflict

defi-wonderland · Nov 4, 2024 · cf061e2 · cf061e2
1 parent f0b77fb
commit cf061e2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/solidity/test/integration/ContractCallRequest.t.sol b/solidity/test/integration/ContractCallRequest.t.sol
@@ -47,6 +47,7 @@ contract Integration_ContractCallRequest is IntegrationBase {
   function test_createRequest_finalizeEmptyResponse() public {
     vm.prank(requester);
     bytes32 _requestId = oracle.createRequest(mockRequest, _ipfsHash, _createAccessControl());
+    uint256 _requestCreatedAt = oracle.requestCreatedAt(_requestId);
 
     // mock an empty response
     mockResponse =
@@ -58,7 +59,10 @@ contract Integration_ContractCallRequest is IntegrationBase {
       abi.encodeCall(IAccountingExtension.release, (mockRequest.requester, _requestId, usdc, _expectedReward))
     );
 
-    vm.warp(block.timestamp + 2 days);
+    // assert response does not exist
+    assertEq(oracle.responseCreatedAt(_getId(mockResponse)), 0);
+
+    vm.warp(_requestCreatedAt + _expectedDeadline);
     vm.prank(_finalizer);
     oracle.finalize(mockRequest, mockResponse, _createAccessControl());
   }