add gasmetering to tests (#1)

Uniswap · Jul 1, 2024 · fd25c20 · fd25c20
1 parent 58d15c2
commit fd25c20
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 9 deletions.
diff --git a/.forge-snapshots/Increment counter number.snap b/.forge-snapshots/Increment counter number.snap
@@ -0,0 +1 @@
+26276
diff --git a/.forge-snapshots/Set counter number.snap b/.forge-snapshots/Set counter number.snap
@@ -0,0 +1 @@
+26363
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -3,12 +3,14 @@ name: test
 on:
   pull_request:
     branches: [main, master, staging, dev, feat/**, fix/**]
+  push:
+    branches: [main, master, staging, dev]
 
 env:
-  FOUNDRY_PROFILE: ci
+  FOUNDRY_PROFILE: ${{ github.event_name == 'push' && 'ci' || 'pr' }}
 
 jobs:
-  check:
+  test:
     strategy:
       fail-fast: true
 
@@ -31,6 +33,7 @@ jobs:
         id: build
 
       - name: Run Forge tests
-        run: |
-          forge test -vvv
+        run: forge test --isolate -vvv
         id: test
+        env:
+          FORGE_SNAPSHOT_CHECK: true
diff --git a/foundry.toml b/foundry.toml
@@ -8,16 +8,30 @@ via_ir = true
 solc = "0.8.23"
 verbosity = 2
 ffi = true
+fs_permissions = [
+  { access = "read-write", path = ".forge-snapshots"},
+  { access = "read", path = "script/" }
+]
 
 remappings = [
   "forge-std=lib/forge-std/src",
   "@openzeppelin/contracts=lib/openzeppelin-contracts/contracts",
   "@openzeppelin/contracts-upgradeable=lib/openzeppelin-contracts-upgradeable/contracts"
 ]
 
-[profile.intense.fuzz]
+[profile.default.fuzz]
+runs = 1000
+
+[profile.pr.fuzz]
 runs = 10000
-max_test_rejects = 999999
+
+[profile.ci.fuzz]
+runs = 100000
+
+[profile.debug]
+via_ir = false
+optimizer_runs = 200
+fuzz.runs = 100
 
 [fmt]
 line_length = 160

diff --git a/lib/forge-std b/lib/forge-std
diff --git a/test/Counter.t.sol b/test/Counter.t.sol
@@ -3,6 +3,7 @@ pragma solidity 0.8.23;
 
 import "forge-std/Test.sol";
 import "test/util/TestHelpers.sol";
+import {GasSnapshot} from "forge-gas-snapshot/GasSnapshot.sol";
 
 import {Counter} from "src/Counter.sol";
 
@@ -15,18 +16,20 @@ abstract contract Deployed is Test, TestHelpers {
     }
 }
 
-contract CounterTest_Deployed is Deployed {
-    function test_IsInitialized() public {
+contract CounterTest_Deployed is Deployed, GasSnapshot {
+    function test_IsInitialized() public view {
         assertEq(counter.number(), 10);
     }
 
     function test_IncrementsNumber() public {
         counter.increment();
+        snapLastCall("Increment counter number");
         assertEq(counter.number(), 11);
     }
 
     function testFuzz_SetsNumber(uint256 x) public {
         counter.setNumber(x);
+        snapLastCall("Set counter number");
         assertEq(counter.number(), x);
     }
 }
+1 −0		.gitattributes
+6 −12		.github/workflows/ci.yml
+3 −1		.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
+518 −225		src/StdAssertions.sol
+15 −9		src/StdChains.sol
+7 −11		src/StdJson.sol
+201 −106		src/StdStorage.sol
+179 −0		src/StdToml.sol
+1 −1		src/StdUtils.sol
+4 −4		src/Test.sol
+1,402 −481		src/Vm.sol
+51 −33		src/mocks/MockERC20.sol
+46 −32		src/mocks/MockERC721.sol
+39 −909		test/StdAssertions.t.sol
+31 −26		test/StdChains.t.sol
+19 −11		test/StdCheats.t.sol
+3 −1		test/StdError.t.sol
+49 −0		test/StdJson.t.sol
+8 −8		test/StdMath.t.sol
+159 −11		test/StdStorage.t.sol
+49 −0		test/StdToml.t.sol
+20 −20		test/StdUtils.t.sol
+3 −3		test/Vm.t.sol
+8 −0		test/fixtures/test.json
+6 −0		test/fixtures/test.toml
+1 −1		test/mocks/MockERC20.t.sol
+1 −1		test/mocks/MockERC721.t.sol