harmonized function naming

lifinance · May 21, 2024 · d115c73 · d115c73
1 parent ef5e983
commit d115c73
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/Facets/GenericSwapFacetV3.sol b/src/Facets/GenericSwapFacetV3.sol
@@ -214,7 +214,7 @@ contract GenericSwapFacetV3 is ILiFi, ReentrancyGuard, SwapperV2, Validatable {
     /// @param _receiver the address to receive the swapped tokens into (also excess tokens)
     /// @param _minAmountOut the minimum amount of the final asset to receive
     /// @param _swapData an object containing swap related data to perform swaps before bridging
-    function swapTokensGenericV3FromERC20ToNative(
+    function swapTokensMultipleV3ERC20ToNative(
         bytes32 _transactionId,
         string calldata _integrator,
         string calldata _referrer,
@@ -241,7 +241,7 @@ contract GenericSwapFacetV3 is ILiFi, ReentrancyGuard, SwapperV2, Validatable {
     /// @param _receiver the address to receive the swapped tokens into (also excess tokens)
     /// @param _minAmountOut the minimum amount of the final asset to receive
     /// @param _swapData an object containing swap related data to perform swaps before bridging
-    function swapTokensGenericV3FromERC20ToERC20(
+    function swapTokensMultipleV3ERC20ToERC20(
         bytes32 _transactionId,
         string calldata _integrator,
         string calldata _referrer,
@@ -268,7 +268,7 @@ contract GenericSwapFacetV3 is ILiFi, ReentrancyGuard, SwapperV2, Validatable {
     /// @param _receiver the address to receive the swapped tokens into (also excess tokens)
     /// @param _minAmountOut the minimum amount of the final asset to receive
     /// @param _swapData an object containing swap related data to perform swaps before bridging
-    function swapTokensGenericV3FromNativeToERC20(
+    function swapTokensMultipleV3NativeToERC20(
         bytes32 _transactionId,
         string calldata _integrator,
         string calldata _referrer,

diff --git a/test/solidity/Facets/GenericSwapFacetV3.t.sol b/test/solidity/Facets/GenericSwapFacetV3.t.sol
@@ -122,13 +122,13 @@ contract GenericSwapFacetV3Test is DSTest, DiamondTest, Test {
             .swapTokensSingleV3NativeToERC20
             .selector;
         functionSelectorsV3[3] = genericSwapFacetV3
-            .swapTokensGenericV3FromERC20ToERC20
+            .swapTokensMultipleV3ERC20ToERC20
             .selector;
         functionSelectorsV3[4] = genericSwapFacetV3
-            .swapTokensGenericV3FromERC20ToNative
+            .swapTokensMultipleV3ERC20ToNative
             .selector;
         functionSelectorsV3[5] = genericSwapFacetV3
-            .swapTokensGenericV3FromNativeToERC20
+            .swapTokensMultipleV3NativeToERC20
             .selector;
 
         addFacet(diamond, address(genericSwapFacetV3), functionSelectorsV3);
@@ -716,7 +716,7 @@ contract GenericSwapFacetV3Test is DSTest, DiamondTest, Test {
             minAmountOut // toAmount (with liquidity in that selected block)
         );
 
-        genericSwapFacetV3.swapTokensGenericV3FromERC20ToERC20(
+        genericSwapFacetV3.swapTokensMultipleV3ERC20ToERC20(
             "",
             "integrator",
             "referrer",
@@ -855,7 +855,7 @@ contract GenericSwapFacetV3Test is DSTest, DiamondTest, Test {
             minAmountOut // toAmount (with liquidity in that selected block)
         );
 
-        genericSwapFacetV3.swapTokensGenericV3FromNativeToERC20{
+        genericSwapFacetV3.swapTokensMultipleV3NativeToERC20{
             value: amountIn
         }(
             "",
@@ -1008,7 +1008,7 @@ contract GenericSwapFacetV3Test is DSTest, DiamondTest, Test {
             minAmountOut // toAmount (with liquidity in that selected block)
         );
 
-        genericSwapFacetV3.swapTokensGenericV3FromERC20ToERC20(
+        genericSwapFacetV3.swapTokensMultipleV3ERC20ToERC20(
             "",
             "integrator",
             "referrer",
@@ -1146,7 +1146,7 @@ contract GenericSwapFacetV3Test is DSTest, DiamondTest, Test {
             minAmountOut // toAmount (with liquidity in that selected block)
         );
 
-        genericSwapFacetV3.swapTokensGenericV3FromNativeToERC20{
+        genericSwapFacetV3.swapTokensMultipleV3NativeToERC20{
             value: amountIn
         }(
             "",
@@ -1300,7 +1300,7 @@ contract GenericSwapFacetV3Test is DSTest, DiamondTest, Test {
             minAmountOut // toAmount (with liquidity in that selected block)
         );
 
-        genericSwapFacetV3.swapTokensGenericV3FromERC20ToNative(
+        genericSwapFacetV3.swapTokensMultipleV3ERC20ToNative(
             "",
             "integrator",
             "referrer",