update StateTestsRunner for GeneralStateTests format

Author: cdetrio

tests/GeneralStateTestsRunner.js

@@ -0,0 +1,82 @@
+const async = require('async')
+const VM = require('../index.js')
+const testUtil = require('./util')
+const Trie = require('merkle-patricia-tree/secure')
+
+function parseTestCases (forkConfig, testData) {
+  const testCases = testData['post'][forkConfig].map(testCase => {
+    let testIndexes = testCase['indexes']
+    let tx = Object.assign({}, testData.transaction)
+    tx.data = testData.transaction.data[testIndexes['data']]
+    tx.gasLimit = testData.transaction.gasLimit[testIndexes['gas']]
+    tx.value = testData.transaction.value[testIndexes['value']]
+    return {
+      'transaction': tx,
+      'postStateRoot': testCase['hash'],
+      'env': testData['env'],
+      'pre': testData['pre']
+    }
+  })
+
+  return testCases
+}
+
+function runTestCase (testData, t, cb) {
+  const state = new Trie()
+  let block, vm
+
+  async.series([
+    function (done) {
+      vm = new VM({
+        state: state,
+        enableHomestead: true
+      })
+      testUtil.setupPreConditions(state, testData, done)
+    },
+    function (done) {
+      var tx = testUtil.makeTx(testData.transaction)
+      block = testUtil.makeBlockFromEnv(testData.env)
+      if (!block.isHomestead() && !testData.homestead) {
+        tx._homestead = false
+      } else {
+        block.isHomestead = function () {
+          return true
+        }
+      }
+
+      if (tx.validate()) {
+        vm.runTx({
+          tx: tx,
+          block: block
+        }, function (err, r) {
+          err = null
+          done()
+        })
+      } else {
+        done()
+      }
+    },
+    function (done) {
+      if (testData.postStateRoot.substr(0, 2) === '0x') {
+        testData.postStateRoot = testData.postStateRoot.substr(2)
+      }
+      t.equal(state.root.toString('hex'), testData.postStateRoot, 'the state roots should match')
+
+      if (state.root.toString('hex') !== testData.postStateRoot.toString('hex')) {
+        // since General State Tests, postState keys are no longer included in
+        // the state test format. only postStateRoot, so can't debug expected post conditions
+        // testUtil.verifyPostConditions(state, testData.post, t, done)
+        done()
+      } else {
+        done()
+      }
+    }
+  ], cb)
+}
+
+module.exports = function runStateTest (options, testData, t, cb) {
+  const testCases = parseTestCases(options.forkConfig, testData)
+  async.eachSeries(testCases,
+                  (testCase, done) => runTestCase(testCase, t, done),
+                  cb)
+}

tests/StateTestsRunner.js

@@ -82,7 +82,7 @@ const skipVM = [
 if (argv.r) {
   randomized(argv.r, argv.v)
 } else if (argv.s) {
-  runTests('StateTests', argv)
+  runTests('GeneralStateTests', argv)
 } else if (argv.v) {
   runTests('VMTests', argv)
 } else if (argv.b) {
@@ -156,7 +156,7 @@ function runAll () {
   require('./genesishashes.js')
   async.series([
     runTests.bind(this, 'VMTests', {}),
-    //runTests.bind(this, 'StateTests', {}), // TODO: update StateTestsRunnner for GeneralStateTests
+    runTests.bind(this, 'GeneralStateTests', {}),
     runTests.bind(this, 'BlockchainTests', {})
   ])
 }

tests/tester.js

@@ -62,7 +62,7 @@ exports.makeTx = function (txData) {
   tx.value = format(txData.value)
   tx.data = format(txData.data, false, true) // slice off 0x
   if (txData.secretKey) {
-    var privKey = new Buffer(txData.secretKey, 'hex')
+    var privKey = format(txData.secretKey, false, true)
     tx.sign(privKey)
   } else {
     tx.v = new Buffer(txData.v.slice(2), 'hex')
@@ -254,7 +254,7 @@ exports.makeBlockHeader = function (data) {
   header.timestamp = format(data.currentTimestamp)
   header.gasLimit = format(data.currentGasLimit)
   if (data.previousHash) {
-    header.parentHash = new Buffer(data.previousHash, 'hex')
+    header.parentHash = format(data.previousHash, false, true)
   }
   header.coinbase = utils.setLength(format(data.currentCoinbase, false, true), 20)
   header.difficulty = format(data.currentDifficulty)