From 12a1d648fd2de6865b0ac56ce9fe7dcd5937db29 Mon Sep 17 00:00:00 2001
From: mr-uniswap <144828035+mr-uniswap@users.noreply.github.com>
Date: Fri, 23 Aug 2024 14:48:39 -0400
Subject: [PATCH] chore: Minor gas optimization (#841)

* chore: Minor gas optimizaiton

Trying out this minor gas optimization where nested ifs are better than multiple &&

* formatted

* change bytecode snap

* snapshots

* snap
---
 .forge-snapshots/poolManager bytecode size.snap             | 2 +-
 .forge-snapshots/simple swap with native.snap               | 2 +-
 .forge-snapshots/simple swap.snap                           | 2 +-
 .forge-snapshots/swap CA custom curve + swap noop.snap      | 2 +-
 .forge-snapshots/swap CA fee on unspecified.snap            | 2 +-
 .../swap against liquidity with native token.snap           | 2 +-
 .forge-snapshots/swap against liquidity.snap                | 2 +-
 .forge-snapshots/swap burn 6909 for input.snap              | 2 +-
 .forge-snapshots/swap burn native 6909 for input.snap       | 2 +-
 .forge-snapshots/swap mint native output as 6909.snap       | 2 +-
 .forge-snapshots/swap mint output as 6909.snap              | 2 +-
 .../swap skips hook call if hook is caller.snap             | 2 +-
 .forge-snapshots/swap with dynamic fee.snap                 | 2 +-
 .forge-snapshots/swap with hooks.snap                       | 2 +-
 .forge-snapshots/swap with lp fee and protocol fee.snap     | 2 +-
 .forge-snapshots/swap with return dynamic fee.snap          | 2 +-
 .forge-snapshots/update dynamic fee in before swap.snap     | 2 +-
 src/libraries/Pool.sol                                      | 6 ++++--
 18 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/.forge-snapshots/poolManager bytecode size.snap b/.forge-snapshots/poolManager bytecode size.snap
index 0c78a0963..c18ec3fbf 100644
--- a/.forge-snapshots/poolManager bytecode size.snap	
+++ b/.forge-snapshots/poolManager bytecode size.snap	
@@ -1 +1 @@
-24304
\ No newline at end of file
+24357
\ No newline at end of file
diff --git a/.forge-snapshots/simple swap with native.snap b/.forge-snapshots/simple swap with native.snap
index 37eadce74..17921620f 100644
--- a/.forge-snapshots/simple swap with native.snap	
+++ b/.forge-snapshots/simple swap with native.snap	
@@ -1 +1 @@
-109245
\ No newline at end of file
+109230
\ No newline at end of file
diff --git a/.forge-snapshots/simple swap.snap b/.forge-snapshots/simple swap.snap
index 32a080c51..61aff5af7 100644
--- a/.forge-snapshots/simple swap.snap	
+++ b/.forge-snapshots/simple swap.snap	
@@ -1 +1 @@
-124091
\ No newline at end of file
+124076
\ No newline at end of file
diff --git a/.forge-snapshots/swap CA custom curve + swap noop.snap b/.forge-snapshots/swap CA custom curve + swap noop.snap
index cdfc3d410..e8176bfcb 100644
--- a/.forge-snapshots/swap CA custom curve + swap noop.snap	
+++ b/.forge-snapshots/swap CA custom curve + swap noop.snap	
@@ -1 +1 @@
-126932
\ No newline at end of file
+126914
\ No newline at end of file
diff --git a/.forge-snapshots/swap CA fee on unspecified.snap b/.forge-snapshots/swap CA fee on unspecified.snap
index e26150d92..062daa000 100644
--- a/.forge-snapshots/swap CA fee on unspecified.snap	
+++ b/.forge-snapshots/swap CA fee on unspecified.snap	
@@ -1 +1 @@
-155536
\ No newline at end of file
+155521
\ No newline at end of file
diff --git a/.forge-snapshots/swap against liquidity with native token.snap b/.forge-snapshots/swap against liquidity with native token.snap
index c6f419c2d..d7efc6fa8 100644
--- a/.forge-snapshots/swap against liquidity with native token.snap	
+++ b/.forge-snapshots/swap against liquidity with native token.snap	
@@ -1 +1 @@
-106203
\ No newline at end of file
+106188
\ No newline at end of file
diff --git a/.forge-snapshots/swap against liquidity.snap b/.forge-snapshots/swap against liquidity.snap
index c3e3c6805..dfe3e6b5d 100644
--- a/.forge-snapshots/swap against liquidity.snap	
+++ b/.forge-snapshots/swap against liquidity.snap	
@@ -1 +1 @@
-117297
\ No newline at end of file
+117282
\ No newline at end of file
diff --git a/.forge-snapshots/swap burn 6909 for input.snap b/.forge-snapshots/swap burn 6909 for input.snap
index b62c9b2c5..06c9ddb08 100644
--- a/.forge-snapshots/swap burn 6909 for input.snap	
+++ b/.forge-snapshots/swap burn 6909 for input.snap	
@@ -1 +1 @@
-129411
\ No newline at end of file
+129396
\ No newline at end of file
diff --git a/.forge-snapshots/swap burn native 6909 for input.snap b/.forge-snapshots/swap burn native 6909 for input.snap
index f17b5fe13..863253149 100644
--- a/.forge-snapshots/swap burn native 6909 for input.snap	
+++ b/.forge-snapshots/swap burn native 6909 for input.snap	
@@ -1 +1 @@
-118873
\ No newline at end of file
+118858
\ No newline at end of file
diff --git a/.forge-snapshots/swap mint native output as 6909.snap b/.forge-snapshots/swap mint native output as 6909.snap
index 53c535a53..e3e91ac83 100644
--- a/.forge-snapshots/swap mint native output as 6909.snap	
+++ b/.forge-snapshots/swap mint native output as 6909.snap	
@@ -1 +1 @@
-140238
\ No newline at end of file
+140223
\ No newline at end of file
diff --git a/.forge-snapshots/swap mint output as 6909.snap b/.forge-snapshots/swap mint output as 6909.snap
index f8d1dafdb..789fc86f1 100644
--- a/.forge-snapshots/swap mint output as 6909.snap	
+++ b/.forge-snapshots/swap mint output as 6909.snap	
@@ -1 +1 @@
-155932
\ No newline at end of file
+155917
\ No newline at end of file
diff --git a/.forge-snapshots/swap skips hook call if hook is caller.snap b/.forge-snapshots/swap skips hook call if hook is caller.snap
index b5254793c..3281e72a4 100644
--- a/.forge-snapshots/swap skips hook call if hook is caller.snap	
+++ b/.forge-snapshots/swap skips hook call if hook is caller.snap	
@@ -1 +1 @@
-207788
\ No newline at end of file
+207758
\ No newline at end of file
diff --git a/.forge-snapshots/swap with dynamic fee.snap b/.forge-snapshots/swap with dynamic fee.snap
index 1c030fcc4..1b3deda02 100644
--- a/.forge-snapshots/swap with dynamic fee.snap	
+++ b/.forge-snapshots/swap with dynamic fee.snap	
@@ -1 +1 @@
-140124
\ No newline at end of file
+140109
\ No newline at end of file
diff --git a/.forge-snapshots/swap with hooks.snap b/.forge-snapshots/swap with hooks.snap
index 02c6f5867..89bdb2a0e 100644
--- a/.forge-snapshots/swap with hooks.snap	
+++ b/.forge-snapshots/swap with hooks.snap	
@@ -1 +1 @@
-132935
\ No newline at end of file
+132920
\ No newline at end of file
diff --git a/.forge-snapshots/swap with lp fee and protocol fee.snap b/.forge-snapshots/swap with lp fee and protocol fee.snap
index 8558db117..6ed69dee6 100644
--- a/.forge-snapshots/swap with lp fee and protocol fee.snap	
+++ b/.forge-snapshots/swap with lp fee and protocol fee.snap	
@@ -1 +1 @@
-169947
\ No newline at end of file
+169932
\ No newline at end of file
diff --git a/.forge-snapshots/swap with return dynamic fee.snap b/.forge-snapshots/swap with return dynamic fee.snap
index f052d1e77..a9e0cfa05 100644
--- a/.forge-snapshots/swap with return dynamic fee.snap	
+++ b/.forge-snapshots/swap with return dynamic fee.snap	
@@ -1 +1 @@
-146451
\ No newline at end of file
+146436
\ No newline at end of file
diff --git a/.forge-snapshots/update dynamic fee in before swap.snap b/.forge-snapshots/update dynamic fee in before swap.snap
index 952138eb0..a6130dee8 100644
--- a/.forge-snapshots/update dynamic fee in before swap.snap	
+++ b/.forge-snapshots/update dynamic fee in before swap.snap	
@@ -1 +1 @@
-148731
\ No newline at end of file
+148716
\ No newline at end of file
diff --git a/src/libraries/Pool.sol b/src/libraries/Pool.sol
index 9c06425d5..00c968a28 100644
--- a/src/libraries/Pool.sol
+++ b/src/libraries/Pool.sol
@@ -309,8 +309,10 @@ library Pool {
 
         bool exactInput = params.amountSpecified < 0;
 
-        if (swapFee == LPFeeLibrary.MAX_LP_FEE && !exactInput) {
-            InvalidFeeForExactOut.selector.revertWith();
+        if (swapFee == LPFeeLibrary.MAX_LP_FEE) {
+            if (!exactInput) {
+                InvalidFeeForExactOut.selector.revertWith();
+            }
         }
 
         if (params.amountSpecified == 0) return (BalanceDeltaLibrary.ZERO_DELTA, 0, swapFee, state);