Merge pull request #1049 from ethereum/fixUnitTesting

Fix unit testing error message

remix-lib/src/web3Provider/web3VmProvider.js

@@ -122,6 +122,7 @@ web3VmProvider.prototype.txProcessed = function (self, data) {
   }
   self.txsReceipt[self.processingHash].logs = logs
   self.txsReceipt[self.processingHash].transactionHash = self.processingHash
+  self.txsReceipt[self.processingHash].status = '0x' + data.vm.exception.toString(16)
 
   if (data.createdAddress) {
     var address = util.hexConvert(data.createdAddress)

remix-simulator/package.json

@@ -15,6 +15,7 @@
   "main": "./index.js",
   "dependencies": {
     "ansi-gray": "^0.1.1",
+    "babel-eslint": "^7.1.1",
     "babel-plugin-transform-object-assign": "^6.22.0",
     "babel-preset-es2017": "^6.24.1",
     "babelify": "^7.3.0",
@@ -23,7 +24,7 @@
     "express": "^4.16.3",
     "fast-async": "^6.3.7",
     "merge": "^1.2.0",
-    "remix-lib": "^0.2.5",
+    "remix-lib": "0.3.10",
     "standard": "^10.0.3",
     "time-stamp": "^2.0.0",
     "web3": "1.0.0-beta.27"

remix-simulator/src/methods/transactions.js

@@ -39,7 +39,7 @@ Transactions.prototype.eth_getTransactionReceipt = function (payload, cb) {
       'cumulativeGasUsed': '0x06345f',
       'contractAddress': receipt.contractAddress,
       'logs': receipt.logs,
-      'status': 1
+      'status': receipt.status
     }
 
     cb(null, r)

remix-tests/package.json

@@ -47,7 +47,7 @@
     "signale": "^1.2.1",
     "solc": "^0.4.24",
     "standard": "^10.0.3",
-    "web3": "1.0.0-beta.34",
+    "web3": "1.0.0-beta.36",
     "winston": "^3.0.0"
   },
   "peerDependencies": {

remix-tests/src/compiler.js

@@ -71,7 +71,7 @@ function compileFileOrFiles (filename, isDirectory, opts, cb) {
   })
 }
 
-function compileContractSources (sources, importFileCb, cb, opts) {
+function compileContractSources (sources, importFileCb, opts, cb) {
   let compiler, filepath
   let accounts = opts.accounts || []
   // Iterate over sources keys. Inject test libraries. Inject test library import statements.

remix-tests/src/index.js

@@ -29,7 +29,7 @@ var runTestSources = function (contractSources, testCallback, resultCallback, fi
       })
     },
     function compile (next) {
-      Compiler.compileContractSources(contractSources, importFileCb, next)
+      Compiler.compileContractSources(contractSources, importFileCb, { accounts }, next)
     },
     function deployAllContracts (compilationResult, next) {
       Deployer.deployAll(compilationResult, web3, function (err, contracts) {

remix-tests/src/testRunner.js

@@ -133,8 +133,8 @@ function runTest (testName, testObject, contractDetails, opts, testCallback, res
         next(err)
       })
     }
-  }, function () {
+  }, function (error) {
-    resultsCallback(null, {
+    resultsCallback(error, {
       passingNum: passingNum,
       failureNum: failureNum,
       timePassed: timePassed