Merge branch 'stylus' into fix-reactivation

.github/workflows/arbitrator-ci.yml

@@ -25,7 +25,7 @@ env:
   WABT_VERSION: 1.0.32
 
 jobs:
-  coverage:
+  arbitrator:
     name: Run Arbitrator tests
     runs-on: ubuntu-8
     steps:
@@ -76,13 +76,6 @@ jobs:
           profile: minimal
           toolchain: "nightly"
 
-      - name: Install grcov
-        uses: actions-rs/[email protected]
-        with:
-          crate: grcov
-          version: latest
-          use-tool-cache: true
-
       - name: Install rust wasm targets
         run: rustup target add wasm32-wasi wasm32-unknown-unknown
 
@@ -164,13 +157,6 @@ jobs:
       - name: Make arbitrator libraries
         run: make -j wasm-ci-build
 
-      - name: Enable rust instrumentation
-        run: |
-          echo LLVM_PROFILE_FILE="your_name-%p-%m.profraw" >> $GITHUB_ENV
-          echo "CARGO_INCREMENTAL=0" >> $GITHUB_ENV
-          echo RUSTFLAGS="-Cinstrument-coverage" >> $GITHUB_ENV
-          echo RUSTDOCFLAGS="-Cpanic=abort" >> $GITHUB_ENV
-
       - name: Run rust tests
         uses: actions-rs/cargo@v1
         with:
@@ -195,18 +181,6 @@ jobs:
       - name: Make proofs from test cases
         run: make -j8 test-gen-proofs
 
-      - name: Create code-coverage files
-        run: |
-          grcov . --binary-path arbitrator/target/release/ -s . -t lcov --branch --ignore-not-existing --ignore "/*" -o lcov.info
-
-      - name: Upload to codecov.io
-        uses: codecov/codecov-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: ./lcov.info
-          fail_ci_if_error: true
-          verbose: false
-
       - name: Start geth server
         run: |
           geth --dev --http --http.port 8545 &

.github/workflows/arbitrator-skip-ci.yml

@@ -12,7 +12,7 @@ on:
       - 'Makefile'
 
 jobs:
-  coverage:
+  arbitrator:
     name: Run Arbitrator tests
     runs-on: ubuntu-latest
     steps: