fix: lint errors & CI (#246)

* fix: lint errors

* ci: fix code coverage

* build: install toolchain if and only if not installed

* ci: don't ignore our coverage files!

* ci: use the code-coverage logic we use in the FVM

* ci: update actions

Author: Stebalien

.github/actions-rs/grcov.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Build
         run: make check-build
@@ -24,31 +24,27 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Test Actors
         run: make test-actors
   code-coverage:
-    if: github.event.pull_request.draft == false 
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Test Libraries
-        run: make test-coverage
-        env:
-          CARGO_INCREMENTAL: '0'
-          RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Coverflow-checks=off'
-          RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Coverflow-checks=off'
-          RUSTC_BOOTSTRAP: '1'
-
-      - name: Generate Coverage Report
-        id: coverage
-        uses: actions-rs/grcov@v0.1
-
-      - name: Upload to Coveralls
-        uses: coverallsapp/github-action@master
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          path-to-lcov: ${{ steps.coverage.outputs.report }}
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Installing Cargo llvm-cov
+      uses: taiki-e/install-action@5651179950649c44da31d346537e20c0534f0f25
+      with:
+        tool: cargo-llvm-cov@0.4.5
+    - name: Running tests with coverage
+      run: make ci-test-coverage
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574
+      with:
+        files: ci-coverage.info
+        token: ${{ secrets.CODECOV_TOKEN }}
+        # Codecov is flaky and will randomly fail. We'd rather not have random failures on master.
+        fail_ci_if_error: false
+        verbose: true

.github/codecov.yml

@@ -28,17 +28,23 @@ test: install-toolchain
 # tests excluding actors so we can generate coverage reports during CI build
 # WASM targets such as actors do not support this so are excluded
 test-coverage: install-toolchain
+	CARGO_INCREMENTAL=0 \
+	RUSTFLAGS='-Cinstrument-coverage -C codegen-units=1 -C llvm-args=--inline-threshold=0 -C overflow-checks=off' \
+	LLVM_PROFILE_FILE='target/coverage/raw/cargo-test-%p-%m.profraw' \
 	cargo test --workspace $(WASM_EXCLUSION)
+	grcov . --binary-path ./target/debug/deps/ -s . -t html --branch --ignore-not-existing --ignore '../*' --ignore "/*" -o target/coverage/html
+
+# Just run the tests we want coverage of (for CI)
+ci-test-coverage: install-toolchain
+	rustup component add llvm-tools-preview
+	cargo llvm-cov --lcov --output-path ci-coverage.info --workspace $(WASM_EXCLUSION)
 
 # separate actor testing stage to run from CI without coverage support
 test-actors: install-toolchain
 	cargo test --package greeter --package helix_integration_tests
 
 install-toolchain:
-	rustup update
-	rustup component add rustfmt
-	rustup component add clippy
-	rustup target add wasm32-unknown-unknown
+	rustup show active-toolchain || rustup toolchain install
 
 clean:
 	cargo clean
@@ -47,7 +53,4 @@ clean:
 
 # generate local coverage report in html format using grcov
 # install it with `cargo install grcov`
-# TODO: fix the output path for LLVM_PROFILE_FILE 
-local-coverage:
-	CARGO_INCREMENTAL=0 RUSTFLAGS='-Cinstrument-coverage' LLVM_PROFILE_FILE='target/coverage/raw/cargo-test-%p-%m.profraw' cargo test --workspace $(WASM_EXCLUSION)
-	grcov . --binary-path ./target/debug/deps/ -s . -t html --branch --ignore-not-existing --ignore '../*' --ignore "/*" -o target/coverage/html
+local-coverage: test-coveuage

.github/workflows/check-pr.yml

@@ -135,7 +135,7 @@ where
     }
 }
 
-impl<'st, S, BS> Token<'st, S, BS>
+impl<S, BS> Token<'_, S, BS>
 where
     S: Syscalls,
     BS: Blockstore,
@@ -633,7 +633,7 @@ where
     }
 }
 
-impl<'st, S, BS> Token<'st, S, BS>
+impl<S, BS> Token<'_, S, BS>
 where
     S: Syscalls,
     BS: Blockstore,

Makefile

@@ -111,7 +111,7 @@ where
     }
 }
 
-impl<'st, S, BS> NFT<'st, S, BS>
+impl<S, BS> NFT<'_, S, BS>
 where
     S: Syscalls,
     BS: Blockstore,