update BlockchainTestsRunner for homestead

Author: cdetrio

package.json

@@ -18,7 +18,7 @@
     "babel-preset-es2015": "^6.24.0",
     "babelify": "^7.3.0",
     "ethereumjs-blockchain": "^1.4.1",
-    "ethereumjs-testing": "^1.0.4",
+    "ethereumjs-testing": "ethereumjs/ethereumjs-testing#homestead-testing-update",
     "ethereumjs-tx": "1.1.0",
     "level": "^1.4.0",
     "leveldown": "^1.4.6",

tests/BlockchainTestsRunner.js

@@ -18,10 +18,12 @@ module.exports = function runBlockchainTest (options, testData, t, cb) {
   blockchain.ethash.cacheDB = cacheDB
   var vm = new VM({
     state: state,
-    blockchain: blockchain
+    blockchain: blockchain,
+    enableHomestead: true
   })
   var genesisBlock = new Block()
 
+  testData.homestead = true
   if (testData.homestead) {
     vm.on('beforeTx', function (tx) {
       tx._homestead = true
@@ -83,8 +85,15 @@ module.exports = function runBlockchainTest (options, testData, t, cb) {
     function getHead (done) {
       vm.blockchain.getHead(function (err, block) {
         t.equal(block.hash().toString('hex'), testData.lastblockhash, 'last block hash')
-        // make sure the state is set beofore checking post conditions
-        state.root = block.header.stateRoot
+        // if the test fails, then block.header is the preState because
+        // vm.runBlock has a check that prevents the actual postState from being
+        // imported if it is not equal to the expected postState. it is useful
+        // for debugging to skip this, so that verifyPostConditions will compare
+        // testData.postState to the actual postState, rather than to the preState.
+        if (!options.debugging) {
+          // make sure the state is set before checking post conditions
+          state.root = block.header.stateRoot
+        }
         done(err)
       })
     },

tests/tester.js

@@ -2,6 +2,7 @@ const argv = require('minimist')(process.argv.slice(2))
 const async = require('async')
 const tape = require('tape')
 const testing = require('ethereumjs-testing')
+const FORK_CONFIG = 'Homestead'
 const skip = [
   'CreateHashCollision', // impossible hash collision on generating address
   'SuicidesMixingCoinbase', // sucides to the coinbase, since we run a blockLevel we create coinbase account.
@@ -29,6 +30,7 @@ const skip = [
   'bcSimpleTransitionTest', // HF stuff
   'loop-mul' // ain't nobody need loops
 ]
+// TODO: skip BlockchainTests/GeneralStateTests/stMemoryStressTest/*
 
 if (argv.r) {
   randomized(argv.r, argv.v)
@@ -76,20 +78,34 @@ function randomized (stateTest) {
   })
 }
 
-function runTests (name, args, cb) {
-  // setup skipe function
-  args.testFn = (name) => {
-    return skip.includes(name)
+function runTests (name, runnerArgs, cb) {
+  let testGetterArgs = argv
+
+  // setup skip function
+  if (name === 'BlockchainTests') {
+    const forkFilter = new RegExp(`${FORK_CONFIG}$`)
+    testGetterArgs.skipFn = (name) => {
+      return ((forkFilter.test(name) === false) || skip.includes(name))
+    }
+  } else {
+    testGetterArgs.skipFn = (name) => {
+      return skip.includes(name)
+    }
   }
 
+
+  runnerArgs.forkConfig = FORK_CONFIG
+  //runnerArgs.debugging = true; // for BlockchainTests
+  //runnerArgs.vmtrace = true; // for VMTests
+
   tape(name, t => {
     const runner = require(`./${name}Runner.js`)
     testing.getTestsFromArgs(name, (fileName, testName, test) => {
       return new Promise((resolve, reject) => {
         t.comment(`file: ${fileName} test: ${testName}`)
-        runner(args, test, t, resolve)
+        runner(runnerArgs, test, t, resolve)
       }).catch(err => console.log(err))
-    }, argv).then(() => {
+    }, testGetterArgs).then(() => {
       t.end()
     })
   })
@@ -100,8 +116,8 @@ function runAll () {
   require('./cacheTest.js')
   require('./genesishashes.js')
   async.series([
-    runTests.bind(this, 'BlockchainTests', {}),
-    runTests.bind(this, 'StateTests', {}),
-    runTests.bind(this, 'VMTests', {})
+    runTests.bind(this, 'VMTests', {}),
+    //runTests.bind(this, 'StateTests', {}), // TODO: update StateTestsRunnner for GeneralStateTests
+    runTests.bind(this, 'BlockchainTests', {})
   ])
 }