Merge pull request #294 from ethereumjs/use-tape

Convert mocha to tape

Author: holgerd77

.eslintrc.js

@@ -1,6 +1,3 @@
 module.exports = {
-  extends: '@ethereumjs/eslint-config-defaults',
-  env: {
-    mocha: true
-  }
+  extends: '@ethereumjs/eslint-config-defaults'
 }

.github/workflows/build.yml

@@ -24,7 +24,7 @@ jobs:
       - run: npm install
 
       - run: npm run lint
-      - run: npm run test
+      - run: npm run coverage
 
       - uses: codecov/codecov-action@v1
         if: matrix.node-version == '12.x'

karma.conf.js

@@ -1,11 +1,10 @@
 module.exports = function(config) {
   config.set({
-    frameworks: ['mocha', 'karma-typescript'],
+    frameworks: ['tap', 'karma-typescript'],
     files: ['src/**/*.ts', 'test/**/*.ts'],
     preprocessors: {
       '**/*.ts': ['karma-typescript']
     },
-    plugins: ['karma-mocha', 'karma-typescript', 'karma-chrome-launcher', 'karma-firefox-launcher'],
     karmaTypescriptConfig: {
       bundlerOptions: {
         entrypoints: /\.spec\.ts$/
@@ -16,7 +15,7 @@ module.exports = function(config) {
     reporters: ['progress', 'karma-typescript'],
     browsers: ['FirefoxHeadless', 'ChromeHeadless'],
     singleRun: true,
-    concurrency: Infinity,
+    concurrency: 1,
     // Fail after timeout
     browserDisconnectTimeout: 100000,
     browserNoActivityTimeout: 100000

package.json

@@ -13,12 +13,13 @@
   "scripts": {
     "build": "ethereumjs-config-ts-build",
     "prepublishOnly": "npm run test && npm run build",
+    "coverage": "ethereumjs-config-coverage",
     "docs:build": "npx typedoc --options typedoc.js",
     "lint": "ethereumjs-config-lint",
     "lint:fix": "ethereumjs-config-lint-fix",
     "test": "npm run test:node && npm run test:browser",
     "test:browser": "karma start karma.conf.js",
-    "test:node": "nyc --reporter=lcov mocha --require ts-node/register 'test/*.spec.ts'",
+    "test:node": "tape -r ts-node/register test/*.spec.ts",
     "tsc": "ethereumjs-config-tsc"
   },
   "husky": {
@@ -97,18 +98,18 @@
     "@ethereumjs/config-typescript": "^2.0.0",
     "@ethereumjs/eslint-config-defaults": "^2.0.0",
     "@types/assert": "^1.5.4",
-    "@types/mocha": "^8.2.0",
     "@types/node": "^11.9.0",
     "@types/secp256k1": "^4.0.1",
+    "@types/tape": "^4.13.0",
     "husky": "^2.1.0",
     "karma": "^5.0.2",
     "karma-chrome-launcher": "^2.0.0",
     "karma-firefox-launcher": "^1.0.0",
-    "karma-mocha": "^2.0.0",
+    "karma-tap": "^4.2.0",
     "karma-typescript": "^4.1.1",
-    "mocha": "^8.2.1",
     "nyc": "^15.0.0",
     "prettier": "^1.15.3",
+    "tape": "^5.2.2",
     "ts-node": "^8.6.2",
     "typedoc": "next",
     "typedoc-plugin-markdown": "^2.2.16",

src/account.ts

@@ -1,20 +1,19 @@
 import assert from 'assert'
 import BN from 'bn.js'
 import * as rlp from 'rlp'
+import {
+  privateKeyVerify,
+  publicKeyCreate,
+  publicKeyVerify,
+  publicKeyConvert
+} from 'ethereum-cryptography/secp256k1'
 import { stripHexPrefix } from 'ethjs-util'
 import { KECCAK256_RLP, KECCAK256_NULL } from './constants'
 import { zeros, bufferToHex, toBuffer } from './bytes'
 import { keccak, keccak256, keccakFromString, rlphash } from './hash'
 import { assertIsHexString, assertIsBuffer } from './helpers'
 import { BNLike, BufferLike, bnToRlp, toType, TypeOutput } from './types'
 
-const {
-  privateKeyVerify,
-  publicKeyCreate,
-  publicKeyVerify,
-  publicKeyConvert
-} = require('ethereum-cryptography/secp256k1')
-
 export interface AccountData {
   nonce?: BNLike
   balance?: BNLike

src/address.ts

@@ -1,5 +1,5 @@
-const assert = require('assert')
-import BN = require('bn.js')
+import assert from 'assert'
+import BN from 'bn.js'
 import { toBuffer, zeros } from './bytes'
 import {
   isValidAddress,

src/externals.ts

@@ -4,11 +4,8 @@
  * @packageDocumentation
  */
 
-// TODO: This can be replaced with a normal ESM import once
-// the new major version of the typescript config package
-// is released and adopted here.
-import BN = require('bn.js')
-import rlp = require('rlp')
+import BN from 'bn.js'
+import * as rlp from 'rlp'
 
 /**
  * [`BN`](https://github.com/indutny/bn.js)

src/hash.ts

@@ -1,4 +1,4 @@
-const { keccak224, keccak384, keccak256: k256, keccak512 } = require('ethereum-cryptography/keccak')
+import { keccak224, keccak384, keccak256 as k256, keccak512 } from 'ethereum-cryptography/keccak'
 const createHash = require('create-hash')
 import * as rlp from 'rlp'
 import { toBuffer, setLengthLeft } from './bytes'