From 8b55d906089ae9ae24dd445b545b0ff1b36dc2fe Mon Sep 17 00:00:00 2001
From: TAMARA LIPOWSKI <data.lipowski@extaccount.com>
Date: Fri, 25 Apr 2025 21:07:48 -0400
Subject: [PATCH] chore: rename dispatcher methods for clarity

---
 foundry/src/Dispatcher.sol    |  4 ++--
 foundry/src/TychoRouter.sol   | 10 +++++-----
 foundry/test/Dispatcher.t.sol |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/foundry/src/Dispatcher.sol b/foundry/src/Dispatcher.sol
index 483b3e6..e6591cb 100644
--- a/foundry/src/Dispatcher.sol
+++ b/foundry/src/Dispatcher.sol
@@ -53,7 +53,7 @@ contract Dispatcher {
      *  protocol-specific data required by the executor.
      */
     // slither-disable-next-line delegatecall-loop,assembly
-    function _callExecutor(
+    function _callSwapOnExecutor(
         address executor,
         uint256 amount,
         bytes calldata data
@@ -85,7 +85,7 @@ contract Dispatcher {
     }
 
     // slither-disable-next-line assembly
-    function _handleCallback(bytes calldata data)
+    function _callHandleCallbackOnExecutor(bytes calldata data)
         internal
         returns (bytes memory)
     {
diff --git a/foundry/src/TychoRouter.sol b/foundry/src/TychoRouter.sol
index 3c62380..55be637 100644
--- a/foundry/src/TychoRouter.sol
+++ b/foundry/src/TychoRouter.sol
@@ -482,7 +482,7 @@ contract TychoRouter is AccessControl, Dispatcher, Pausable, ReentrancyGuard {
             swap_.decodeSingleSwap();
 
         uint256 initialBalanceTokenOut = _balanceOf(tokenOut, receiver);
-        amountOut = _callExecutor(executor, amountIn, protocolData);
+        amountOut = _callSwapOnExecutor(executor, amountIn, protocolData);
 
         if (amountOut < minAmountOut) {
             revert TychoRouter__NegativeSlippage(amountOut, minAmountOut);
@@ -616,7 +616,7 @@ contract TychoRouter is AccessControl, Dispatcher, Pausable, ReentrancyGuard {
                 : remainingAmounts[tokenInIndex];
 
             currentAmountOut =
-                _callExecutor(executor, currentAmountIn, protocolData);
+                _callSwapOnExecutor(executor, currentAmountIn, protocolData);
             // Checks if the output token is the same as the input token
             if (tokenOutIndex == 0) {
                 cyclicSwapAmountOut += currentAmountOut;
@@ -650,7 +650,7 @@ contract TychoRouter is AccessControl, Dispatcher, Pausable, ReentrancyGuard {
                 swap.decodeSingleSwap();
 
             calculatedAmount =
-                _callExecutor(executor, calculatedAmount, protocolData);
+                _callSwapOnExecutor(executor, calculatedAmount, protocolData);
         }
     }
 
@@ -658,7 +658,7 @@ contract TychoRouter is AccessControl, Dispatcher, Pausable, ReentrancyGuard {
      * @dev We use the fallback function to allow flexibility on callback.
      */
     fallback() external {
-        bytes memory result = _handleCallback(msg.data);
+        bytes memory result = _callHandleCallbackOnExecutor(msg.data);
         // slither-disable-next-line assembly
         assembly ("memory-safe") {
             // Propagate the calculatedAmount
@@ -786,7 +786,7 @@ contract TychoRouter is AccessControl, Dispatcher, Pausable, ReentrancyGuard {
         returns (bytes memory)
     {
         if (data.length < 24) revert TychoRouter__InvalidDataLength();
-        bytes memory result = _handleCallback(data);
+        bytes memory result = _callHandleCallbackOnExecutor(data);
         return result;
     }
 
diff --git a/foundry/test/Dispatcher.t.sol b/foundry/test/Dispatcher.t.sol
index a7409fe..5841f26 100644
--- a/foundry/test/Dispatcher.t.sol
+++ b/foundry/test/Dispatcher.t.sol
@@ -10,7 +10,7 @@ contract DispatcherExposed is Dispatcher {
         uint256 amount,
         bytes calldata data
     ) external returns (uint256 calculatedAmount) {
-        return _callExecutor(executor, amount, data);
+        return _callSwapOnExecutor(executor, amount, data);
     }
 
     function exposedSetExecutor(address target) external {