feat: move invalidCommandType revert out of if-else

pancakeswap · Sep 13, 2024 · 51be189 · 51be189
1 parent cc2d2e2
commit 51be189
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 19 deletions.
diff --git a/.forge-snapshots/StableSwapTest#test_stableSwap_ExactInput0For1.snap b/.forge-snapshots/StableSwapTest#test_stableSwap_ExactInput0For1.snap
@@ -1 +1 @@
-193198
+193207
diff --git a/.forge-snapshots/StableSwapTest#test_stableSwap_ExactInput1For0.snap b/.forge-snapshots/StableSwapTest#test_stableSwap_ExactInput1For0.snap
@@ -1 +1 @@
-192654
+192663
diff --git a/.forge-snapshots/UniversalRouterBytecodeSize.snap b/.forge-snapshots/UniversalRouterBytecodeSize.snap
@@ -1 +1 @@
-24108
+24168
diff --git a/.forge-snapshots/V3ToV4MigrationNativeTest#test_v4CLPositionmanager_Mint_Native.snap b/.forge-snapshots/V3ToV4MigrationNativeTest#test_v4CLPositionmanager_Mint_Native.snap
@@ -1 +1 @@
-559336
+559351
diff --git a/.forge-snapshots/V3ToV4MigrationTest#test_v4BinPositionmanager_BinAddLiquidity.snap b/.forge-snapshots/V3ToV4MigrationTest#test_v4BinPositionmanager_BinAddLiquidity.snap
@@ -1 +1 @@
-594165
+594181
diff --git a/.forge-snapshots/V3ToV4MigrationTest#test_v4BinPositionmanager_BinAddLiquidity_Native.snap b/.forge-snapshots/V3ToV4MigrationTest#test_v4BinPositionmanager_BinAddLiquidity_Native.snap
@@ -1 +1 @@
-569991
+570007
diff --git a/.forge-snapshots/V3ToV4MigrationTest#test_v4CLPositionmanager_Mint.snap b/.forge-snapshots/V3ToV4MigrationTest#test_v4CLPositionmanager_Mint.snap
@@ -1 +1 @@
-583518
+583533
diff --git a/src/base/Dispatcher.sol b/src/base/Dispatcher.sol
@@ -157,10 +157,8 @@ abstract contract Dispatcher is
                         }
                         Payments.payPortion(token, map(recipient), bips);
                         return (success, output);
-                    } else {
-                        // placeholder area for command 0x07
-                        revert InvalidCommandType(command);
                     }
+                    // placeholder area for command 0x07
                 } else {
                     // 0x08 <= command < 0x10
                     if (command == Commands.V2_SWAP_EXACT_IN) {
@@ -248,10 +246,8 @@ abstract contract Dispatcher is
                         success = (ERC20(token).balanceOf(owner) >= minBalance);
                         if (!success) output = abi.encodePacked(BalanceTooLow.selector);
                         return (success, output);
-                    } else {
-                        // placeholder area for command 0x0f
-                        revert InvalidCommandType(command);
                     }
+                    // placeholder area for command 0x0f
                 }
             } else {
                 // 0x10 <= command < 0x21
@@ -306,10 +302,8 @@ abstract contract Dispatcher is
                     // do not permit or approve this contract over a v4 position or someone could use this command to decrease, burn, or transfer your position
                     (success, output) = address(V4_BIN_POSITION_MANAGER).call{value: address(this).balance}(inputs);
                     return (success, output);
-                } else {
-                    // placeholder area for commands 0x15-0x20
-                    revert InvalidCommandType(command);
                 }
+                // placeholder area for commands 0x15-0x20
             }
         } else {
             // 0x21 <= command
@@ -356,11 +350,10 @@ abstract contract Dispatcher is
                 uint256 amountIn = stableSwapExactOutputAmountIn(amountOut, amountInMax, path, flag);
                 stableSwapExactOutput(map(recipient), amountIn, amountOut, path, flag, payer);
                 return (success, output);
-            } else {
-                // placeholder area for commands 0x24-0x3f
-                revert InvalidCommandType(command);
             }
+            // placeholder area for commands 0x24-0x3f
         }
+        revert InvalidCommandType(command);
     }
 
     /// @notice Calculates the recipient address for a command