Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib/Tick.sol
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ library Tick {
bool initialized;
// total liquidity at tick
uint128 liquidityGross;
// amount of liqudiity added or subtracted when tick is crossed
// amount of liquidity added or subtracted when tick is crossed
int128 liquidityNet;
// fee growth on the other side of this tick (relative to the current tick)
uint256 feeGrowthOutside0X128;
Expand Down
34 changes: 17 additions & 17 deletions test/UniswapV3Pool.Swaps.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ contract UniswapV3PoolSwapsTest is Test, UniswapV3PoolUtils {
),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);

Expand Down Expand Up @@ -135,7 +135,7 @@ contract UniswapV3PoolSwapsTest is Test, UniswapV3PoolUtils {
liquidity: liquidityRanges(range, range),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);

Expand Down Expand Up @@ -233,7 +233,7 @@ contract UniswapV3PoolSwapsTest is Test, UniswapV3PoolUtils {
),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);

Expand Down Expand Up @@ -372,7 +372,7 @@ contract UniswapV3PoolSwapsTest is Test, UniswapV3PoolUtils {
),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);

Expand Down Expand Up @@ -505,7 +505,7 @@ contract UniswapV3PoolSwapsTest is Test, UniswapV3PoolUtils {
),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);

Expand Down Expand Up @@ -586,7 +586,7 @@ contract UniswapV3PoolSwapsTest is Test, UniswapV3PoolUtils {
),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);

Expand Down Expand Up @@ -673,7 +673,7 @@ contract UniswapV3PoolSwapsTest is Test, UniswapV3PoolUtils {
liquidity: liquidityRanges(range, range),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);

Expand Down Expand Up @@ -771,7 +771,7 @@ contract UniswapV3PoolSwapsTest is Test, UniswapV3PoolUtils {
),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);

Expand Down Expand Up @@ -910,7 +910,7 @@ contract UniswapV3PoolSwapsTest is Test, UniswapV3PoolUtils {
),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);

Expand Down Expand Up @@ -1043,7 +1043,7 @@ contract UniswapV3PoolSwapsTest is Test, UniswapV3PoolUtils {
),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);

Expand Down Expand Up @@ -1114,7 +1114,7 @@ contract UniswapV3PoolSwapsTest is Test, UniswapV3PoolUtils {
liquidity: liquidity,
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
});
setupPool(params);

Expand All @@ -1135,7 +1135,7 @@ contract UniswapV3PoolSwapsTest is Test, UniswapV3PoolUtils {
liquidity: liquidity,
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
});
setupPool(params);

Expand All @@ -1161,7 +1161,7 @@ contract UniswapV3PoolSwapsTest is Test, UniswapV3PoolUtils {
),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);

Expand Down Expand Up @@ -1254,7 +1254,7 @@ contract UniswapV3PoolSwapsTest is Test, UniswapV3PoolUtils {
liquidity: liquidity,
transferInMintCallback: true,
transferInSwapCallback: false,
mintLiqudity: true
mintLiquidity: true
});
setupPool(params);

Expand All @@ -1272,7 +1272,7 @@ contract UniswapV3PoolSwapsTest is Test, UniswapV3PoolUtils {
),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);

Expand Down Expand Up @@ -1346,7 +1346,7 @@ contract UniswapV3PoolSwapsTest is Test, UniswapV3PoolUtils {
),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);

Expand Down Expand Up @@ -1516,7 +1516,7 @@ contract UniswapV3PoolSwapsTest is Test, UniswapV3PoolUtils {
params.currentPrice
);

if (params.mintLiqudity) {
if (params.mintLiquidity) {
weth.approve(address(this), params.balances[0]);
usdc.approve(address(this), params.balances[1]);

Expand Down
2 changes: 1 addition & 1 deletion test/UniswapV3Pool.Utils.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ abstract contract UniswapV3PoolUtils is Test, TestUtils {
LiquidityRange[] liquidity;
bool transferInMintCallback;
bool transferInSwapCallback;
bool mintLiqudity;
bool mintLiquidity;
}

function liquidityRange(
Expand Down
26 changes: 13 additions & 13 deletions test/UniswapV3Pool.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ contract UniswapV3PoolTest is Test, UniswapV3PoolUtils {
),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);

Expand Down Expand Up @@ -154,7 +154,7 @@ contract UniswapV3PoolTest is Test, UniswapV3PoolUtils {
),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);

Expand Down Expand Up @@ -219,7 +219,7 @@ contract UniswapV3PoolTest is Test, UniswapV3PoolUtils {
),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);

Expand Down Expand Up @@ -283,7 +283,7 @@ contract UniswapV3PoolTest is Test, UniswapV3PoolUtils {
),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);

Expand Down Expand Up @@ -357,7 +357,7 @@ contract UniswapV3PoolTest is Test, UniswapV3PoolUtils {
),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);

Expand Down Expand Up @@ -436,7 +436,7 @@ contract UniswapV3PoolTest is Test, UniswapV3PoolUtils {
),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);

Expand Down Expand Up @@ -515,7 +515,7 @@ contract UniswapV3PoolTest is Test, UniswapV3PoolUtils {
),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);
LiquidityRange memory liq = liquidity[0];
Expand Down Expand Up @@ -610,7 +610,7 @@ contract UniswapV3PoolTest is Test, UniswapV3PoolUtils {
),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);
LiquidityRange memory liq = liquidity[0];
Expand Down Expand Up @@ -684,7 +684,7 @@ contract UniswapV3PoolTest is Test, UniswapV3PoolUtils {
),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);
LiquidityRange memory liq = liquidity[0];
Expand Down Expand Up @@ -744,7 +744,7 @@ contract UniswapV3PoolTest is Test, UniswapV3PoolUtils {
),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);
LiquidityRange memory liq = liquidity[0];
Expand Down Expand Up @@ -850,7 +850,7 @@ contract UniswapV3PoolTest is Test, UniswapV3PoolUtils {
),
transferInMintCallback: false,
transferInSwapCallback: true,
mintLiqudity: false
mintLiquidity: false
})
);

Expand All @@ -874,7 +874,7 @@ contract UniswapV3PoolTest is Test, UniswapV3PoolUtils {
),
transferInMintCallback: true,
transferInSwapCallback: true,
mintLiqudity: true
mintLiquidity: true
})
);

Expand Down Expand Up @@ -978,7 +978,7 @@ contract UniswapV3PoolTest is Test, UniswapV3PoolUtils {
params.currentPrice
);

if (params.mintLiqudity) {
if (params.mintLiquidity) {
weth.approve(address(this), params.balances[0]);
usdc.approve(address(this), params.balances[1]);

Expand Down