Ignore coverage report, increase coverage, adjust CI (#4)

* Ignore coverage report, increase coverage, adjust CI

* remove test helper

.github/workflows/coverage.yaml

@@ -14,8 +14,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+        # with:
+        #   token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install foundry
         uses: foundry-rs/foundry-toolchain@v1
@@ -34,6 +34,7 @@ jobs:
           forge coverage | grep '^|' | grep -v 'test/'
           echo EOF
           } >> "$GITHUB_OUTPUT"
+          echo $GITHUB_OUTPUT
         env:
           FOUNDRY_RPC_URL: "${{ secrets.RPC_URL }}"
 
@@ -51,7 +52,7 @@ jobs:
             const currentCoverage = fs.readFileSync(file, "utf8").trim();
             const newCoverage = (`${{ steps.coverage.outputs.COVERAGE }}`).trim();
             if (newCoverage != currentCoverage) {
-              core.setFailed(`Code coverage not updated. Run : forge coverage | grep '^|' | grep -v 'test/'  > coverage.txt`);
+              core.setFailed(`Code coverage not updated. Run : forge coverage --no-match-coverage "(test)" | grep '^|' > coverage.txt`);
             }
 
       - name: Comment on PR

.gitignore

@@ -2,6 +2,7 @@
 /out
 /cache
 /coverage
+/report
 lcov.info
 .DS_Store
 .env
@@ -10,7 +11,3 @@ lcov.info
 
 broadcast/*/31337
 deployments/**/31337.*
-
-# storage layout checker library
-storage_check_cache
-storage_check_report

script/Deploy.s.sol

@@ -8,8 +8,8 @@ import {Counter} from 'src/Counter.sol';
 contract Deploy is Script {
     using stdJson for string;
 
-    function run() public {
+    function run() public returns (Counter) {
         uint256 initialNumber = 5;
-        new Counter(initialNumber);
+        return new Counter(initialNumber);
     }
 }

test/Counter.t.sol

@@ -3,11 +3,11 @@ pragma solidity 0.8.26;
 
 import {GasSnapshot} from 'forge-gas-snapshot/GasSnapshot.sol';
 import 'forge-std/Test.sol';
-import 'test/util/TestHelpers.sol';
 
+import {Deploy} from 'script/Deploy.s.sol';
 import {Counter} from 'src/Counter.sol';
 
-abstract contract Deployed is Test, TestHelpers {
+abstract contract Deployed is Test {
     Counter counter;
 
     function setUp() public virtual {
@@ -38,3 +38,15 @@ contract CounterTest_Deployed is Deployed, GasSnapshot {
         snapLastCall('Set counter number');
     }
 }
+
+contract DeploymentTest is Test {
+    Counter counter;
+
+    function setUp() public virtual {
+        counter = new Deploy().run();
+    }
+
+    function test_IsDeployedCorrectly() public view {
+        assertEq(counter.number(), 5);
+    }
+}