Merge pull request #813 from etherisc/feature/oracle-service-refactoring

refactor: rename resendRequest to resendResponse in FlightProduct and related contracts (#745)
etherisc · Dec 13, 2024 · f060b81 · f060b81
2 parents 2247f73 + 4ff28f9
commit f060b81
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/contracts/examples/flight/FlightProduct.sol b/contracts/examples/flight/FlightProduct.sol
@@ -216,12 +216,12 @@ contract FlightProduct is
     }
 
 
-    function resendRequest(RequestId requestId)
+    function resendResponse(RequestId requestId)
         external
         virtual
         restricted()
     {
-        _resendRequest(requestId);
+        _resendResponse(requestId);
     }
 
 

diff --git a/contracts/examples/flight/FlightProductAuthorization.sol b/contracts/examples/flight/FlightProductAuthorization.sol
@@ -57,7 +57,7 @@ contract FlightProductAuthorization
 
         // authorize public role (additional authz via onlyOwner)
         functions = _authorizeForTarget(getMainTargetName(), PUBLIC_ROLE());
-        _authorize(functions, FlightProduct.resendRequest.selector, "resendRequest");
+        _authorize(functions, FlightProduct.resendResponse.selector, "resendResponse");
         _authorize(functions, FlightProduct.processPayoutsAndClosePolicies.selector, "processPayoutsAndClosePolicies");
         _authorize(functions, FlightProduct.setConstants.selector, "setConstants");
         _authorize(functions, FlightProduct.setTestMode.selector, "setTestMode");

diff --git a/contracts/shared/InstanceLinkedComponent.sol b/contracts/shared/InstanceLinkedComponent.sol
@@ -92,7 +92,7 @@ abstract contract InstanceLinkedComponent is
     }
 
 
-    function _resendRequest(RequestId requestId)
+    function _resendResponse(RequestId requestId)
         internal
         virtual
     {

diff --git a/test/examples/flight/FlightProduct.t.sol b/test/examples/flight/FlightProduct.t.sol
@@ -590,7 +590,7 @@ contract FlightProductTest is FlightBaseTest {
 
         // WHEN resend request (with sufficient gas)
         vm.startPrank(flightOwner);
-        flightProduct.resendRequest(requestId);
+        flightProduct.resendResponse(requestId);
         vm.stopPrank();
 
         // THEN
@@ -870,7 +870,7 @@ contract FlightProductTest is FlightBaseTest {
         _transferTokenToPoolWallet(5000 *  10 ** flightUSD.decimals(), true);
 
         vm.startPrank(statusProvider);
-        flightProduct.resendRequest(requestId);
+        flightProduct.resendResponse(requestId);
         vm.stopPrank();
 
         // check intermediate state
-Original file line number
+Diff line change
@@ Expand Up / @@ -92,7 +92,7 @@ abstract contract InstanceLinkedComponent is @@
         }
-        function _resendRequest(RequestId requestId)
+        function _resendResponse(RequestId requestId)
             internal
             virtual
         {
@@ Expand Down @@