Switch c8 to @vitest/coverage-v8 (#3845)

* switch c8 to `@vitest/coverage-v8` * Fix some client coverage issues * fix timeouts * skip coverage config * Remove unused scripts and turn on lcov * fix config * Skip cli tests --------- Co-authored-by: Jochem Brouwer <[email protected]>
ethereumjs · Jan 24, 2025 · 60ed998 · 60ed998
1 parent 2b44dff
commit 60ed998
Show file tree

Hide file tree

Showing 28 changed files with 80 additions and 190 deletions.
diff --git a/config/eslint.cjs b/config/eslint.cjs
@@ -26,6 +26,7 @@ module.exports = {
     'vitest.config.ts',
     'vitest.config.browser.ts',
     'vitest.config.unit.ts',
+    'vitest.config.coverage.ts',
     'vite.*.ts',
     'ethereum-tests',
     'archive',

diff --git a/config/vitest.config.coverage.mts b/config/vitest.config.coverage.mts
@@ -0,0 +1,18 @@
+import { defineConfig } from 'vitest/config'
+
+const config = defineConfig({
+  test: {
+    silent: true,
+    testTimeout: 180000,
+    coverage: {
+      provider: 'v8',
+      enabled: true,
+      all: true,
+    },
+  },
+  optimizeDeps: {
+    exclude: ['kzg-wasm'],
+  },
+})
+
+export default config
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -35,9 +35,8 @@
     "@types/tape": "4.13.2",
     "@typescript-eslint/eslint-plugin": "5.33.1",
     "@typescript-eslint/parser": "5.33.1",
-    "@vitest/coverage-v8": "3.0.2",
+    "@vitest/coverage-v8": "^3.0.2",
     "@vitest/ui": "3.0.2",
-    "c8": "7.12.0",
     "cspell": "^8.13.3",
     "embedme": "1.22.1",
     "eslint": "8.57.0",

diff --git a/packages/block/package.json b/packages/block/package.json
@@ -29,7 +29,7 @@
     "biome:fix": "npx @biomejs/biome check --write",
     "build": "../../config/cli/ts-build.sh",
     "clean": "../../config/cli/clean-package.sh",
-    "coverage": "DEBUG=ethjs npx vitest run --coverage.enabled --coverage.reporter=lcov",
+    "coverage": "DEBUG=ethjs npx vitest run -c ../../config/vitest.config.coverage.mts",
     "docs:build": "typedoc --options typedoc.cjs",
     "examples": "tsx ../../scripts/examples-runner.ts -- block",
     "examples:build": "npx embedme README.md",

diff --git a/packages/blockchain/package.json b/packages/blockchain/package.json
@@ -29,7 +29,7 @@
     "biome:fix": "npx @biomejs/biome check --write",
     "build": "../../config/cli/ts-build.sh",
     "clean": "../../config/cli/clean-package.sh",
-    "coverage": "DEBUG=ethjs npx vitest run --coverage.enabled --coverage.reporter=lcov",
+    "coverage": "DEBUG=ethjs npx vitest run -c ../../config/vitest.config.coverage.mts",
     "docs:build": "typedoc --options typedoc.cjs",
     "examples": "tsx ../../scripts/examples-runner.ts -- blockchain",
     "examples:build": "npx embedme README.md",

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -33,7 +33,7 @@
     "client:start": "npm run client:start:js --",
     "client:start:dev1": "npm run client:start -- --discDns=false --discV4=false --bootnodes",
     "client:start:dev2": "npm run client:start -- --discDns=false --discV4=false --port=30304 --dataDir=datadir-dev2",
-    "coverage": "npx vitest --coverage --coverage.include=src --coverage.reporter=lcov run test/* -c=./vitest.config.unit.ts",
+    "coverage": "DEBUG=ethjs npx vitest run -c ./vitest.config.coverage.ts",
     "docs:build": "typedoc --options typedoc.cjs --tsconfig tsconfig.prod.cjs.json",
     "examples": "tsx ../../scripts/examples-runner.ts -- client",
     "lint": "npm run biome && eslint --config .eslintrc.cjs . --ext .js,.ts",

diff --git a/packages/client/test/execution/vmexecution.spec.ts b/packages/client/test/execution/vmexecution.spec.ts
@@ -224,4 +224,4 @@ describe('[VMExecution]', () => {
 
     closeRPC(server)
   })
-}, 30000)
+})
diff --git a/packages/client/test/rpc/debug/setHead.spec.ts b/packages/client/test/rpc/debug/setHead.spec.ts
@@ -44,7 +44,7 @@ describe(method, async () => {
         `vm execution should set hash to new head`,
       )
     }
-  }, 30000)
+  })
 
   it('should return error for pending block', async () => {
     const blockchain = await createBlockchainFromBlocksData(mainnetData, {

diff --git a/packages/client/test/rpc/eth/estimateGas.spec.ts b/packages/client/test/rpc/eth/estimateGas.spec.ts
@@ -210,4 +210,4 @@ describe(method, () => {
     assert.equal(res.error.code, INVALID_PARAMS)
     assert.ok(res.error.message.includes('"pending" is not yet supported'))
   })
-}, 20000)
+})
diff --git a/packages/client/test/rpc/eth/getBalance.spec.ts b/packages/client/test/rpc/eth/getBalance.spec.ts
@@ -100,4 +100,4 @@ describe(method, () => {
     assert.equal(res.error.code, INVALID_PARAMS)
     assert.ok(res.error.message.includes('"pending" is not yet supported'))
   })
-}, 40000)
+})
diff --git a/packages/client/test/rpc/eth/getTransactionCount.spec.ts b/packages/client/test/rpc/eth/getTransactionCount.spec.ts
@@ -78,7 +78,7 @@ describe(method, () => {
     // call with nonexistent account
     res = await rpc.request(method, [`0x${'11'.repeat(20)}`, 'latest'])
     assert.equal(res.result, `0x0`, 'should return 0x0 for nonexistent account')
-  }, 40000)
+  })
 
   it('call with pending block argument', async () => {
     const blockchain = await createBlockchain()
@@ -109,5 +109,5 @@ describe(method, () => {
 
     const res = await rpc.request(method, [address.toString(), 'pending'])
     assert.equal(res.result, '0x1')
-  }, 40000)
+  })
 })
diff --git a/packages/client/vitest.config.coverage.ts b/packages/client/vitest.config.coverage.ts
@@ -0,0 +1,19 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    silent: true,
+    exclude: ['test/integration', 'test/sim', 'test/cli/*.spec.ts', 'test/logging.spec.ts'],
+    testTimeout: 300000,
+    alias: { '@polkadot/util': 'false' },
+    typecheck: {
+      tsconfig: './tsconfig.prod.esm.json',
+    },
+    coverage: {
+      provider: 'v8',
+      enabled: true,
+      all: true,
+      reporter: ['lcov'],
+    },
+  },
+})
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -42,7 +42,7 @@
     "biome:fix": "npx @biomejs/biome check --write",
     "build": "../../config/cli/ts-build.sh",
     "clean": "../../config/cli/clean-package.sh",
-    "coverage": "DEBUG=ethjs npx vitest run --coverage.enabled --coverage.reporter=lcov",
+    "coverage": "DEBUG=ethjs npx vitest run -c ../../config/vitest.config.coverage.mts",
     "docs:build": "typedoc --options typedoc.cjs",
     "examples": "tsx ../../scripts/examples-runner.ts -- common",
     "examples:build": "npx embedme README.md",

diff --git a/packages/devp2p/package.json b/packages/devp2p/package.json
@@ -45,7 +45,7 @@
     "biome:fix": "npx @biomejs/biome check --write",
     "build": "../../config/cli/ts-build.sh",
     "clean": "../../config/cli/clean-package.sh",
-    "coverage": "DEBUG=ethjs npx vitest run --coverage.enabled --coverage.reporter=lcov",
+    "coverage": "DEBUG=ethjs npx vitest run -c ../../config/vitest.config.coverage.mts",
     "docs:build": "typedoc --options typedoc.cjs",
     "examples": "tsx ../../scripts/examples-runner.ts -- devp2p",
     "examples:build": "npx embedme README.md",

diff --git a/packages/ethash/package.json b/packages/ethash/package.json
@@ -29,7 +29,7 @@
     "biome:fix": "npx @biomejs/biome check --write",
     "build": "../../config/cli/ts-build.sh",
     "clean": "../../config/cli/clean-package.sh",
-    "coverage": "npx vitest --coverage --coverage.include=src --coverage.reporter=lcov run test/*",
+    "coverage": "DEBUG=ethjs npx vitest run -c ../../config/vitest.config.coverage.mts",
     "docs:build": "typedoc --options typedoc.cjs",
     "examples": "tsx ../../scripts/examples-runner.ts -- ethash",
     "examples:build": "npx embedme README.md",

diff --git a/packages/evm/package.json b/packages/evm/package.json
@@ -30,8 +30,7 @@
     "biome:fix": "npx @biomejs/biome check --write",
     "build": "../../config/cli/ts-build.sh",
     "clean": "../../config/cli/clean-package.sh",
-    "coverage": "DEBUG=ethjs npx vitest run --coverage.enabled --coverage.reporter=lcov",
-    "coverage:test": "npm run test:node && cd ../vm && npm run tester -- --state",
+    "coverage": "DEBUG=ethjs npx vitest run -c ../../config/vitest.config.coverage.mts",
     "docs:build": "typedoc --options typedoc.cjs",
     "examples": "tsx ../../scripts/examples-runner.ts -- evm",
     "examples:build": "npx embedme README.md",

diff --git a/packages/genesis/package.json b/packages/genesis/package.json
@@ -41,7 +41,7 @@
     "biome:fix": "npx @biomejs/biome check --write",
     "build": "../../config/cli/ts-build.sh",
     "clean": "../../config/cli/clean-package.sh",
-    "coverage": "DEBUG=ethjs npx vitest run --coverage.enabled --coverage.reporter=lcov",
+    "coverage": "DEBUG=ethjs npx vitest run -c ../../config/vitest.config.coverage.mts",
     "examples": "tsx ../../scripts/examples-runner.ts -- genesis",
     "examples:build": "npx embedme README.md",
     "docs:build": "typedoc --options typedoc.cjs",

diff --git a/packages/mpt/package.json b/packages/mpt/package.json
@@ -31,7 +31,7 @@
     "biome:fix": "npx @biomejs/biome check --write",
     "build": "../../config/cli/ts-build.sh",
     "clean": "../../config/cli/clean-package.sh",
-    "coverage": "DEBUG=ethjs npx vitest run --coverage.enabled --coverage.reporter=lcov",
+    "coverage": "DEBUG=ethjs npx vitest run -c ../../config/vitest.config.coverage.mts",
     "docs:build": "typedoc --options typedoc.cjs",
     "examples": "tsx ../../scripts/examples-runner.ts -- mpt",
     "examples:build": "npx embedme README.md",
-Original file line number
+Diff line change
@@ Expand Up / @@ -224,4 +224,4 @@ describe('[VMExecution]', () => { @@
         closeRPC(server)
       })
-    }, 30000)
+    })