Merge pull request ethereumjs#130 from cdetrio/homestead-testing-update

testing update for homestead

Author: cdetrio

.travis.yml

@@ -4,8 +4,7 @@ os:
 
 language: node_js
 node_js:
-  - "5"
-  - "6"
+  - "7"
 addons:
   apt:
     sources:
@@ -23,12 +22,12 @@ matrix:
   fast_finish: true
   include:
     - os: linux
-      node_js: "6"
+      node_js: "7"
+      env: CXX=g++-4.8 TEST_SUITE=lint
+    - os: linux
+      node_js: "7"
       env: CXX=g++-4.8 TEST_SUITE=testVM
     - os: linux
-      node_js: "6"
+      node_js: "7"
       env: CXX=g++-4.8 TEST_SUITE=testBlockchain
-    - os: linux
-      node_js: "6"
-      env: CXX=g++-4.8 TEST_SUITE=lint
 script: npm run $TEST_SUITE

README.md

@@ -1,10 +1,10 @@
-# SYNOPSIS 
+# SYNOPSIS
 
 [![NPM Package](https://img.shields.io/npm/v/ethereumjs-vm.svg?style=flat-square)](https://www.npmjs.org/package/ethereumjs-vm)
 [![Build Status](https://img.shields.io/travis/ethereumjs/ethereumjs-vm.svg?branch=master&style=flat-square)](https://travis-ci.org/ethereumjs/ethereumjs-vm)
 [![Gitter](https://img.shields.io/gitter/room/ethereum/ethereumjs-lib.svg?style=flat-square)](https://gitter.im/ethereum/ethereumjs-lib) or #ethereumjs on freenode  
 
-[![js-standard-style](https://cdn.rawgit.com/feross/standard/master/badge.svg)](https://github.com/feross/standard) 
+[![js-standard-style](https://cdn.rawgit.com/feross/standard/master/badge.svg)](https://github.com/feross/standard)
 
 Implements Ethereum's VM in JS
 
@@ -23,7 +23,7 @@ code = new Buffer(code, 'hex')
 
 vm.runCode({
   code: code,
-  gasLimit: new Buffer('ffffffff', 'hex') 
+  gasLimit: new Buffer('ffffffff', 'hex')
 }, function(err, results){
   console.log('returned: ' + results.return.toString('hex'));
 })
@@ -101,7 +101,7 @@ Runs EVM code
 - `opts.caller` - The address that ran this code. The address should be a `Buffer` of 20bits. Defaults to `0`
 - `cb` - The callback. It is given two arguments, an `error` string containing an error that may have happened or `null` and a `results` object with the following properties
   - `gas` - the amount of gas left as a `bignum`
-  - `gasUsed` - the amount of gas as a `bignum` the code used to run. 
+  - `gasUsed` - the amount of gas as a `bignum` the code used to run.
   - `gasRefund` - a `Bignum` containing the amount of gas to refund from deleting storage values
   - `suicides` - an `Object` with keys for accounts that have suicided and values for balance transfer recipient accounts.
   - `logs` - an `Array` of logs that the contract emitted.
@@ -136,18 +136,18 @@ vm.generateGenesis(genesisData, function(){
 ### `events`
 All events are instances of [async-eventemmiter](https://www.npmjs.com/package/async-eventemitter). If an event handler has an arity of 2 the VM will pause until the callback is called
 
-#### `step` 
+#### `step`
 The `step` event is given an `Object` and callback. The `Object` has the following properties.
 - `pc` - a `Number` representing the program counter
 - `opcode` - the next opcode to be ran
 - `gas` - a `bignum` standing for the amount of gasLeft
-- `stack` - an `Array` of `Buffers` containing the stack. 
+- `stack` - an `Array` of `Buffers` containing the stack.
 - `storageTrie` - the storage [trie](https://github.com/wanderer/merkle-patricia-tree) for the account
 - `account` - the [`Account`](https://github.com/ethereum/ethereumjs-account) which owns the code running.
 - `address` - the address of the `account`
 - `depth` - the current number of calls deep the contract is
 - `memory` - the memory of the VM as a `buffer`
-- `cache` - The account cache. Contains all the accounts loaded from the trie. It is an instance of [functional red black tree](https://www.npmjs.com/package/functional-red-black-tree) 
+- `cache` - The account cache. Contains all the accounts loaded from the trie. It is an instance of [functional red black tree](https://www.npmjs.com/package/functional-red-black-tree)
 
 #### `beforeBlock`
 Emits the block that is about to be processed.
@@ -164,11 +164,17 @@ Emits the result of the transaction.
 # TESTING
 `npm test`  
 if you want to just run the Blockchain tests run
-`./test/tester -b`
+`node ./tests/tester -b`
 if you want to just run the VM tests run
-`./test/tester -v`
+`node ./tests/tester -v`
 if you want to just run the State tests run
-`./test/tester -s`
+`node ./tests/tester -s`
+
+To run the all the tests in a file:
+`node ./tests/tester -b --file='randomStatetest303'`
+
+or to run a specific test case:
+`node ./tests/tester -v --test='log0_nonEmptyMem_logMemSize1_logMemStart31'``
 
 # Internal Structure
 The VM processes state changes at many levels.

circle.yml

@@ -1,10 +1,10 @@
 machine:
   node:
-    version: 6.3.1
+    version: 7.1.0
 dependencies:
   pre:
     - "npm rebuild"
 test:
   override:
-    - case $CIRCLE_NODE_INDEX in 0) npm run testState ;; 1) npm run testVM ;; 2) npm run testBlockchain ;; 3) npm run lint ;; esac:
+    - case $CIRCLE_NODE_INDEX in 0) npm run lint ;; 1) npm run testVM ;; 2) npm run testState ;; 3) npm run testBlockchain ;; esac:
         parallel: true

package.json

@@ -34,11 +34,11 @@
     ]
   },
   "scripts": {
-    "testVM": "./tests/tester -v",
-    "testState": "./tests/tester -s",
-    "testBlockchain": "./tests/tester -b",
+    "testVM": "node --harmony ./tests/tester -v",
+    "testState": "node --harmony ./tests/tester -s",
+    "testBlockchain": "node --harmony ./tests/tester -b",
     "lint": "standard",
-    "test": "./tests/tester -a"
+    "test": "node --harmony ./tests/tester -a"
   },
   "repository": {
     "type": "git",

tests/blockchainRunner.js renamed to 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
@@ -82,9 +84,20 @@ module.exports = function runBlockchainTest (options, testData, t, cb) {
     },
     function getHead (done) {
       vm.blockchain.getHead(function (err, block) {
+        if (testData.lastblockhash.substr(0,2) === '0x') {
+          // fix for BlockchainTests/GeneralStateTests/stRandom/*
+          testData.lastblockhash = testData.lastblockhash.substr(2)
+        }
         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/stateRunner.js renamed to tests/StateTestsRunner.js

@@ -1,4 +1,4 @@
-const genesisData = require('ethereumjs-testing').tests.basicTests.genesishashestest
+const genesisData = require('ethereumjs-testing').getSingleFile('BasicTests/genesishashestest.json')
 const tape = require('tape')
 const VM = require('../')