Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move gas snapshots to snapLastCall and forge test --isolate #131

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Move gas snapshots to snapLastCall and forge test --isolate #131

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eba30a5
use snapLastCall
Jun1on Jun 26, 2024
9143f18
forge test --isolate
Jun1on Jun 26, 2024
261688e
snapLastCall to all
Jun1on Jul 1, 2024
5ade065
update foundry.toml
Jun1on Jul 18, 2024
19afc3a
Merge branch 'main' into 113-move-gas-snapshots-to-snaplastcall-and-f…
Jun1on Jul 18, 2024
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 .forge-snapshots/FullRangeAddInitialLiquidity.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
311181
351599
2 changes: 1 addition & 1 deletion .forge-snapshots/FullRangeAddLiquidity.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
122990
160908
2 changes: 1 addition & 1 deletion .forge-snapshots/FullRangeFirstSwap.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
80220
140744
2 changes: 1 addition & 1 deletion .forge-snapshots/FullRangeInitialize.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1015181
1032313
2 changes: 1 addition & 1 deletion .forge-snapshots/FullRangeRemoveLiquidity.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
110566
145773
2 changes: 1 addition & 1 deletion .forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
240044
281063
2 changes: 1 addition & 1 deletion .forge-snapshots/FullRangeSecondSwap.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
45930
114959
2 changes: 1 addition & 1 deletion .forge-snapshots/FullRangeSwap.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
79351
141889
2 changes: 1 addition & 1 deletion .forge-snapshots/OracleGrow10Slots.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
232960
249167
2 changes: 1 addition & 1 deletion .forge-snapshots/OracleGrow10SlotsCardinalityGreater.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
223649
249167
2 changes: 1 addition & 1 deletion .forge-snapshots/OracleGrow1Slot.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
32845
49052
2 changes: 1 addition & 1 deletion .forge-snapshots/OracleGrow1SlotCardinalityGreater.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
23545
49052
2 changes: 1 addition & 1 deletion .forge-snapshots/OracleInitialize.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
51310
67610
2 changes: 1 addition & 1 deletion .forge-snapshots/TWAMMSubmitOrder.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
122336
155811
2 changes: 1 addition & 1 deletion lib/forge-gas-snapshot
Open in desktop
Submodule forge-gas-snapshot updated 19 files
+0 −1 .forge-snapshots/add.snap
+0 −1 .forge-snapshots/addClosure.snap
+1 −1 .forge-snapshots/checkManyAdd.snap
+1 −1 .forge-snapshots/checkSize.snap
+1 −1 .forge-snapshots/internalClosure.snap
+1 −1 .forge-snapshots/manyAdd.snap
+1 −1 .forge-snapshots/manySstore.snap
+1 −0 .forge-snapshots/singleSstore.snap
+1 −0 .forge-snapshots/singleSstoreClosure.snap
+1 −0 .forge-snapshots/singleSstoreLastCall.snap
+1 −1 .forge-snapshots/sizeTarget.snap
+1 −1 .forge-snapshots/sstoreClosure.snap
+1 −1 .github/workflows/test.yml
+21 −0 LICENSE
+1 −1 lib/forge-std
+11 −2 src/GasSnapshot.sol
+4 −0 src/test/SimpleOperations.sol
+5 −2 src/utils/UintString.sol
+31 −23 test/GasSnapshot.t.sol
2 changes: 1 addition & 1 deletion lib/forge-std
Open in desktop
Submodule forge-std updated 41 files
+1 −0 .gitattributes
+48 −12 .github/workflows/ci.yml
+31 −0 .github/workflows/sync.yml
+0 −3 .gitmodules
+1 −1 README.md
+3 −3 foundry.toml
+0 −1 lib/ds-test
+1 −1 package.json
+635 −0 scripts/vm.py
+5 −3 src/Base.sol
+4 −3 src/Script.sol
+518 −225 src/StdAssertions.sol
+56 −30 src/StdChains.sol
+205 −17 src/StdCheats.sol
+34 −4 src/StdInvariant.sol
+25 −25 src/StdJson.sol
+244 −98 src/StdStorage.sol
+2 −2 src/StdStyle.sol
+179 −0 src/StdToml.sol
+72 −35 src/StdUtils.sol
+7 −6 src/Test.sol
+1,651 −307 src/Vm.sol
+394 −382 src/console2.sol
+234 −0 src/mocks/MockERC20.sol
+231 −0 src/mocks/MockERC721.sol
+13,248 −0 src/safeconsole.sol
+44 −853 test/StdAssertions.t.sol
+126 −60 test/StdChains.t.sol
+253 −46 test/StdCheats.t.sol
+13 −11 test/StdError.t.sol
+49 −0 test/StdJson.t.sol
+27 −12 test/StdMath.t.sol
+222 −42 test/StdStorage.t.sol
+4 −4 test/StdStyle.t.sol
+49 −0 test/StdToml.t.sol
+80 −35 test/StdUtils.t.sol
+15 −0 test/Vm.t.sol
+8 −0 test/fixtures/test.json
+6 −0 test/fixtures/test.toml
+441 −0 test/mocks/MockERC20.t.sol
+721 −0 test/mocks/MockERC721.t.sol
24 changes: 8 additions & 16 deletions test/FullRange.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,8 @@ contract TestFullRange is Test, Deployers, GasSnapshot {
vm.expectEmit(true, true, true, true);
emit Initialize(id, testKey.currency0, testKey.currency1, testKey.fee, testKey.tickSpacing, testKey.hooks);

snapStart("FullRangeInitialize");
manager.initialize(testKey, SQRT_PRICE_1_1, ZERO_BYTES);
snapEnd();
snapLastCall("FullRangeInitialize");

(, address liquidityToken) = fullRange.poolInfo(id);

Expand All @@ -154,9 +153,8 @@ contract TestFullRange is Test, Deployers, GasSnapshot {
key.currency0, key.currency1, 3000, 10 ether, 10 ether, 9 ether, 9 ether, address(this), MAX_DEADLINE
);

snapStart("FullRangeAddInitialLiquidity");
fullRange.addLiquidity(addLiquidityParams);
snapEnd();
snapLastCall("FullRangeAddInitialLiquidity");

(bool hasAccruedFees, address liquidityToken) = fullRange.poolInfo(id);
uint256 liquidityTokenBal = UniswapV4ERC20(liquidityToken).balanceOf(address(this));
Expand Down Expand Up @@ -220,9 +218,8 @@ contract TestFullRange is Test, Deployers, GasSnapshot {
MAX_DEADLINE
);

snapStart("FullRangeAddLiquidity");
fullRange.addLiquidity(addLiquidityParams);
snapEnd();
snapLastCall("FullRangeAddLiquidity");

(bool hasAccruedFees,) = fullRange.poolInfo(idWithLiq);
uint256 liquidityTokenBal = UniswapV4ERC20(liquidityToken).balanceOf(address(this));
Expand Down Expand Up @@ -275,9 +272,8 @@ contract TestFullRange is Test, Deployers, GasSnapshot {
HookEnabledSwapRouter.TestSettings memory settings =
HookEnabledSwapRouter.TestSettings({takeClaims: false, settleUsingBurn: false});

snapStart("FullRangeSwap");
router.swap(key, params, settings, ZERO_BYTES);
snapEnd();
snapLastCall("FullRangeSwap");

(bool hasAccruedFees,) = fullRange.poolInfo(id);

Expand Down Expand Up @@ -338,16 +334,14 @@ contract TestFullRange is Test, Deployers, GasSnapshot {
HookEnabledSwapRouter.TestSettings memory settings =
HookEnabledSwapRouter.TestSettings({takeClaims: false, settleUsingBurn: false});

snapStart("FullRangeFirstSwap");
router.swap(testKey, params, settings, ZERO_BYTES);
snapEnd();
snapLastCall("FullRangeFirstSwap");

(bool hasAccruedFees,) = fullRange.poolInfo(id);
assertEq(hasAccruedFees, true);

snapStart("FullRangeSecondSwap");
router.swap(testKey, params, settings, ZERO_BYTES);
snapEnd();
snapLastCall("FullRangeSecondSwap");

(hasAccruedFees,) = fullRange.poolInfo(id);
assertEq(hasAccruedFees, true);
Expand Down Expand Up @@ -395,9 +389,8 @@ contract TestFullRange is Test, Deployers, GasSnapshot {
FullRange.RemoveLiquidityParams memory removeLiquidityParams =
FullRange.RemoveLiquidityParams(keyWithLiq.currency0, keyWithLiq.currency1, 3000, 1 ether, MAX_DEADLINE);

snapStart("FullRangeRemoveLiquidity");
fullRange.removeLiquidity(removeLiquidityParams);
snapEnd();
snapLastCall("FullRangeRemoveLiquidity");

(bool hasAccruedFees,) = fullRange.poolInfo(idWithLiq);
uint256 liquidityTokenBal = UniswapV4ERC20(liquidityToken).balanceOf(address(this));
Expand Down Expand Up @@ -564,9 +557,8 @@ contract TestFullRange is Test, Deployers, GasSnapshot {
FullRange.RemoveLiquidityParams memory removeLiquidityParams =
FullRange.RemoveLiquidityParams(keyWithLiq.currency0, keyWithLiq.currency1, 3000, 5 ether, MAX_DEADLINE);

snapStart("FullRangeRemoveLiquidityAndRebalance");
fullRange.removeLiquidity(removeLiquidityParams);
snapEnd();
snapLastCall("FullRangeRemoveLiquidityAndRebalance");

(bool hasAccruedFees,) = fullRange.poolInfo(idWithLiq);
assertEq(hasAccruedFees, false);
Expand Down
15 changes: 5 additions & 10 deletions test/Oracle.t.sol
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looking at the branch locally, theres still some snapEnd(); calls in this file -- any reason why we arent changing those?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i noticed it as a pattern in v4-core where single tests would still use snapEnd
i wasn't sure, but is there a reason for that?

Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ contract TestOracle is Test, GasSnapshot {
}

function testInitialize() public {
snapStart("OracleInitialize");
oracle.initialize(OracleImplementation.InitializeParams({time: 1, tick: 1, liquidity: 1}));
snapEnd();
snapLastCall("OracleInitialize");

assertEq(oracle.index(), 0);
assertEq(oracle.cardinality(), 1);
Expand Down Expand Up @@ -90,29 +89,25 @@ contract TestOracle is Test, GasSnapshot {
}

function testGas1Slot() public {
snapStart("OracleGrow1Slot");
initializedOracle.grow(2);
snapEnd();
snapLastCall("OracleGrow1Slot");
}

function testGas10Slots() public {
snapStart("OracleGrow10Slots");
initializedOracle.grow(11);
snapEnd();
snapLastCall("OracleGrow10Slots");
}

function testGas1SlotCardinalityGreater() public {
initializedOracle.grow(2);
snapStart("OracleGrow1SlotCardinalityGreater");
initializedOracle.grow(3);
snapEnd();
snapLastCall("OracleGrow1SlotCardinalityGreater");
}

function testGas10SlotCardinalityGreater() public {
initializedOracle.grow(2);
snapStart("OracleGrow10SlotsCardinalityGreater");
initializedOracle.grow(12);
snapEnd();
snapLastCall("OracleGrow10SlotsCardinalityGreater");
}

function testWrite() public {
Expand Down
3 changes: 1 addition & 2 deletions test/TWAMM.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,8 @@ contract TWAMMTest is Test, Deployers, GasSnapshot {

vm.warp(10000);
token0.approve(address(twamm), 100 ether);
snapStart("TWAMMSubmitOrder");
twamm.submitOrder(poolKey, orderKey, 1 ether);
snapEnd();
snapLastCall("TWAMMSubmitOrder");

ITWAMM.Order memory submittedOrder = twamm.getOrder(poolKey, orderKey);
(uint256 sellRateCurrent0For1, uint256 earningsFactorCurrent0For1) = twamm.getOrderPool(poolKey, true);
Expand Down
Loading