remove async from util

restore skip test in state manager

change promisify to util.promisify

Author: jochem-brouwer

packages/blockchain/src/index.ts

@@ -14,26 +14,12 @@ import {
   numberToHashKey,
   tdKey,
 } from './util'
+const promisify = require('util.promisify')
 
 const Stoplight = require('flow-stoplight')
 const level = require('level-mem')
 const semaphore = require('semaphore')
 
-// promisify a function: resolves this promise if callback is called
-function promisify(func: Function) {
-  return function () {
-    return new Promise((resolve, reject) => {
-      func(function (err: any, value: any) {
-        if (err) {
-          reject(err)
-        } else {
-          resolve(value)
-        }
-      })
-    })
-  }
-}
-
 export interface BlockchainInterface {
   /**
    * Adds a block to the blockchain.
@@ -551,7 +537,7 @@ export default class Blockchain implements BlockchainInterface {
         cb(err)
       })
 
-    function verifyPOW(next: any) {
+    function verifyPOW(value: any, next: any) {
       if (!self._validatePow) {
         return next()
       }
@@ -561,7 +547,7 @@ export default class Blockchain implements BlockchainInterface {
       })
     }
 
-    function getCurrentTd(next: any) {
+    function getCurrentTd(value: any, next: any) {
       if (isGenesis) {
         currentTd.header = new BN(0)
         currentTd.block = new BN(0)
@@ -592,7 +578,7 @@ export default class Blockchain implements BlockchainInterface {
         })
     }
 
-    function getBlockTd(next: any) {
+    function getBlockTd(value: any, next: any) {
       if (isGenesis) {
         return next()
       }
@@ -607,7 +593,7 @@ export default class Blockchain implements BlockchainInterface {
       })
     }
 
-    function rebuildInfo(next: any) {
+    function rebuildInfo(prevValue: any, next: any) {
       // save block and total difficulty to the database
       let key = tdKey(number, hash)
       let value = rlp.encode(td)
@@ -1034,7 +1020,7 @@ export default class Blockchain implements BlockchainInterface {
     }
 
     // check if block is in the canonical chain
-    function checkCanonical(cb2: any) {
+    function checkCanonical(value: any, cb2: any) {
       self._numberToHash(blockNumber, (err?: any, hash?: any) => {
         inCanonical = !err && hash.equals(hash)
         cb2()
@@ -1043,12 +1029,12 @@ export default class Blockchain implements BlockchainInterface {
 
     // delete the block, and if block is in the canonical chain, delete all
     // children as well
-    function buildDBops(cb2: any) {
+    function buildDBops(value: any, cb2: any) {
       self._delChild(hash, blockNumber, inCanonical ? parentHash : null, dbOps, cb2)
     }
 
     // delete all number to hash mappings for deleted block number and above
-    function deleteStaleAssignments(cb2: any) {
+    function deleteStaleAssignments(value: any, cb2: any) {
       if (inCanonical) {
         self._deleteStaleAssignments(blockNumber, parentHash, dbOps, cb2)
       } else {
@@ -1165,7 +1151,7 @@ export default class Blockchain implements BlockchainInterface {
         .then(function () {
           blockNumber.iaddn(1)
         })
-        .catch(function (error) {
+        .catch(function (error: any) {
           blockNumber = false
           if (error.type !== 'NotFoundError') {
             throw error
@@ -1182,7 +1168,7 @@ export default class Blockchain implements BlockchainInterface {
         })
       }
 
-      function runFunc(cb3: any) {
+      function runFunc(value: any, cb3: any) {
         const reorg = lastBlock ? lastBlock.hash().equals(block.header.parentHash) : false
         lastBlock = block
         func(block, reorg, cb3)

packages/vm/tests/api/state/stateManager.js

@@ -178,6 +178,10 @@ tape('StateManager', t => {
   })
 
   t.test('should generate the genesis state root correctly for mainnet from common', async st => {
+    if (isRunningInKarma()) {
+      st.skip('skip slow test when running in karma')
+      return st.end()
+    }
     const common = new Common('mainnet', 'petersburg')
     const expectedStateRoot = Buffer.from(common.genesis().stateRoot.slice(2), 'hex')
     const stateManager = new StateManager({ common: common })

packages/vm/tests/util.js

@@ -1,4 +1,3 @@
-const async = require('async')
 const { BN, rlp, keccak256, stripHexPrefix, setLengthLeft } = require('ethereumjs-util')
 const Account = require('@ethereumjs/account').default
 const Transaction = require('@ethereumjs/tx').Transaction
@@ -38,32 +37,23 @@ exports.dumpState = function (state, cb) {
     })
   }
 
-  readAccounts(state).then(function (accounts) {
-    async.mapSeries(
-      accounts,
-      function (account, cb) {
-        readStorage(state, account).then((storage) => {
-          account.storage = storage
-          cb(null, account)
-        })
-      },
-      function (err, results) {
-        if (err) {
-          cb(err, null)
-        }
-        for (let i = 0; i < results.length; i++) {
-          console.log("SHA3'd address: " + results[i].address.toString('hex'))
-          console.log('\tstate root: ' + results[i].stateRoot.toString('hex'))
-          console.log('\tstorage: ')
-          for (let storageKey in results[i].storage) {
-            console.log('\t\t' + storageKey + ': ' + results[i].storage[storageKey])
-          }
-          console.log('\tnonce: ' + new BN(results[i].nonce).toString())
-          console.log('\tbalance: ' + new BN(results[i].balance).toString())
-        }
-        return cb()
-      },
-    )
+  readAccounts(state).then(async function (accounts) {
+    let results = []
+    for (let key = 0; key < accounts.length; key++) {
+      let result = await readStorage(state, accounts[key])
+      results.push(result)
+    }
+    for (let i = 0; i < results.length; i++) {
+      console.log("SHA3'd address: " + results[i].address.toString('hex'))
+      console.log('\tstate root: ' + results[i].stateRoot.toString('hex'))
+      console.log('\tstorage: ')
+      for (let storageKey in results[i].storage) {
+        console.log('\t\t' + storageKey + ': ' + results[i].storage[storageKey])
+      }
+      console.log('\tnonce: ' + new BN(results[i].nonce).toString())
+      console.log('\tbalance: ' + new BN(results[i].balance).toString())
+    }
+    cb()
   })
 }
 
@@ -124,9 +114,7 @@ exports.verifyPostConditions = function (state, testData, t, cb) {
     keyMap[hash] = key
   }
 
-  var q = async.queue(function (task, cb2) {
-    exports.verifyAccountPostConditions(state, task.address, task.account, task.testData, t, cb2)
-  }, 1)
+  var q = []
 
   var stream = state.createReadStream()
 
@@ -138,29 +126,26 @@ exports.verifyPostConditions = function (state, testData, t, cb) {
     delete keyMap[key]
 
     if (testData) {
-      q.push({
-        address: address,
-        account: acnt,
-        testData: testData,
-      })
+      q.push(new Promise((resolve, reject) => {
+        exports.verifyAccountPostConditions(state, address, account, testData, t, function() {
+          resolve()
+        })
+      }))
     } else {
       t.fail('invalid account in the trie: ' + key)
     }
   })
 
-  stream.on('end', function () {
+  stream.on('end', async function () {
     function onEnd() {
       for (hash in keyMap) {
         t.fail('Missing account!: ' + keyMap[hash])
       }
       cb()
     }
 
-    if (q.length()) {
-      q.drain = onEnd
-    } else {
-      onEnd()
-    }
+    await Promise.all(q)
+    onEnd()
   })
 }