Revert "chore: linting"

This reverts commit 7ef686c.
Axis-Fi · Apr 24, 2024 · c454db1 · c454db1
1 parent 424bee7
commit c454db1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/test/callbacks/UniswapV3DTL/UniswapV3DTLTest.sol b/test/callbacks/UniswapV3DTL/UniswapV3DTLTest.sol
@@ -20,6 +20,7 @@ import {LinearVesting} from "src/modules/derivatives/LinearVesting.sol";
 import {MockERC20} from "solmate/test/utils/mocks/MockERC20.sol";
 
 import {WithSalts} from "test/lib/WithSalts.sol";
+import {console2} from "forge-std/console2.sol";
 
 abstract contract UniswapV3DirectToLiquidityTest is Test, Permit2User, WithSalts {
     using Callbacks for UniswapV3DirectToLiquidity;

diff --git a/test/lib/SqrtPriceMath.t.sol b/test/lib/SqrtPriceMath.t.sol
@@ -6,35 +6,35 @@ import {Test} from "forge-std/Test.sol";
 import {SqrtPriceMath} from "src/lib/uniswap-v3/SqrtPriceMath.sol";
 
 contract SqrtPriceMathTest is Test {
-    address internal constant _TOKEN0 = 0x64aa3364F17a4D01c6f1751Fd97C2BD3D7e7f1D5;
-    address internal constant _TOKEN1 = 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2;
+    address internal constant TOKEN0 = 0x64aa3364F17a4D01c6f1751Fd97C2BD3D7e7f1D5;
+    address internal constant TOKEN1 = 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2;
 
     // From OHM-WETH pool
     // Token id: 562564
     // https://revert.finance/#/account/0x245cc372C84B3645Bf0Ffe6538620B04a217988B (for current amounts)
     // https://etherscan.io/address/0x88051b0eea095007d3bef21ab287be961f3d8598#readContract#F11 (for sqrtPriceX96)
-    uint256 internal constant _AMOUNT0 = 185_339_349_000_000;
-    uint256 internal constant _AMOUNT1 = 647_257_004_000_000_000_000;
-    uint160 internal constant __SQRTPRICEX96_ACTUAL = 148_058_773_132_005_407_513_152_397_312_640;
-    uint160 internal constant _SQRTPRICEX96 = 148_058_773_168_959_257_235_299_580_805_548;
+    uint256 internal constant AMOUNT0 = 185_339_349_000_000;
+    uint256 internal constant AMOUNT1 = 647_257_004_000_000_000_000;
+    uint160 internal constant SQRTPRICEX96_ACTUAL = 148_058_773_132_005_407_513_152_397_312_640;
+    uint160 internal constant SQRTPRICEX96 = 148_058_773_168_959_257_235_299_580_805_548;
     // sqrt((647.257004*1e18)/(185339.349*1e9))*2**96 ~= 148058773132005407513152397312640
 
-    // [X] when tokenA is _TOKEN0
+    // [X] when tokenA is token0
     //  [X] it calculates the correct sqrtPriceX96
-    // [X] when tokenA is _TOKEN1
+    // [X] when tokenA is token1
     //  [X] it calculates the correct sqrtPriceX96
     // [X] when tokenA decimals is greater than tokenB decimals
     //  [X] it calculates the correct sqrtPriceX96
     // [X] when tokenA decimals is less than tokenB decimals
     //  [X] it calculates the correct sqrtPriceX96
 
-    function test_whenTokenAIs_TOKEN0() public {
-        uint160 sqrtPriceX96 = SqrtPriceMath.getSqrtPriceX96(_TOKEN0, _TOKEN1, _AMOUNT0, _AMOUNT1);
-        assertEq(sqrtPriceX96, _SQRTPRICEX96, "SqrtPriceX96");
+    function test_whenTokenAIsToken0() public {
+        uint160 sqrtPriceX96 = SqrtPriceMath.getSqrtPriceX96(TOKEN0, TOKEN1, AMOUNT0, AMOUNT1);
+        assertEq(sqrtPriceX96, SQRTPRICEX96, "SqrtPriceX96");
     }
 
-    function test_whenTokenAIs_TOKEN1() public {
-        uint160 sqrtPriceX96 = SqrtPriceMath.getSqrtPriceX96(_TOKEN1, _TOKEN0, _AMOUNT1, _AMOUNT0);
-        assertEq(sqrtPriceX96, _SQRTPRICEX96, "SqrtPriceX96");
+    function test_whenTokenAIsToken1() public {
+        uint160 sqrtPriceX96 = SqrtPriceMath.getSqrtPriceX96(TOKEN1, TOKEN0, AMOUNT1, AMOUNT0);
+        assertEq(sqrtPriceX96, SQRTPRICEX96, "SqrtPriceX96");
     }
 }