From ee7495551ec1304f336f46375a667f40d3e7c66f Mon Sep 17 00:00:00 2001 From: TAMARA LIPOWSKI Date: Thu, 10 Apr 2025 11:02:04 -0400 Subject: [PATCH] chore: Renamings + comment fixes - Renamed ExecutorTransferMethods to TokenTransfer to avoid leaking information about how the transfer happens into the executor. The executor shouldn't care if there are multiple methods or one single method that takes care of everything. - Also renamed TransferMethod to TransferType to match the rust encoding --- foundry/src/executors/ExecutorTransferMethods.sol | 0 foundry/src/executors/TokenTransfer.sol | 1 + foundry/test/executors/UniswapV3Executor.t.sol | 4 +--- 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 foundry/src/executors/ExecutorTransferMethods.sol diff --git a/foundry/src/executors/ExecutorTransferMethods.sol b/foundry/src/executors/ExecutorTransferMethods.sol deleted file mode 100644 index e69de29..0000000 diff --git a/foundry/src/executors/TokenTransfer.sol b/foundry/src/executors/TokenTransfer.sol index f529b69..683fedb 100644 --- a/foundry/src/executors/TokenTransfer.sol +++ b/foundry/src/executors/TokenTransfer.sol @@ -50,3 +50,4 @@ contract TokenTransfer { } } } + diff --git a/foundry/test/executors/UniswapV3Executor.t.sol b/foundry/test/executors/UniswapV3Executor.t.sol index 819fbbc..19aa02a 100644 --- a/foundry/test/executors/UniswapV3Executor.t.sol +++ b/foundry/test/executors/UniswapV3Executor.t.sol @@ -90,9 +90,7 @@ contract UniswapV3ExecutorTest is Test, Constants, Permit2TestHelper { assertEq(receiver, address(2)); assertEq(target, address(3)); assertEq(zeroForOne, false); - assertEq( - uint8(transferType), uint8(TokenTransfer.TransferType.TRANSFER) - ); + assertEq(uint8(transferType), uint8(TokenTransfer.TransferType.TRANSFER)); } function testDecodeParamsInvalidDataLength() public {