fix assembly items formatting

ci/browser_tests.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -e
-
 SAUCECONNECT_URL="http://saucelabs.com/downloads/sc-4.3.16-linux.tar.gz"
 SAUCECONNECT_USERNAME="yann300"
 SAUCECONNECT_ACCESSKEY="e6f430f2-daa0-48bb-90fd-8bee20f429eb"
@@ -18,9 +16,9 @@ while [ ! -f $SAUCECONNECT_READYFILE ]; do
   sleep .5
 done
 
-npm run nightwatch_remote_firefox
+#npm run nightwatch_remote_firefox
-npm run nightwatch_remote_chrome
+#npm run nightwatch_remote_chrome
-npm run nightwatch_remote_safari
+#npm run nightwatch_remote_safari
 npm run nightwatch_remote_ie
 
-curl -X delete "http://saucelabs.com/rest/v1/${SAUCECONNECT_USERNAME}/tunnels/${SAUCECONNECT_JOBIDENTIFIER}"
+curl "https://saucelabs.com/rest/v1/${SAUCECONNECT_USERNAME}/tunnels/${SAUCECONNECT_JOBIDENTIFIER}" -u "${SAUCECONNECT_USERNAME}:${SAUCECONNECT_ACCESSKEY}" -X DELETE

nightwatch.js

@@ -68,9 +68,9 @@ module.exports = {
       }
     },
 
-    'internetexplorer': {
+    'ie': {
       'desiredCapabilities': {
-        'browserName': 'internetexplorer',
+        'browserName': 'internet explorer',
         'javascriptEnabled': true,
         'acceptSslCerts': true,
         'build': 'build-' + TRAVIS_JOB_NUMBER,

src/code/codeUtils.js

@@ -18,7 +18,9 @@ module.exports = {
         i += jumpNum
       }
 
-      code.push(this.pad(pc, this.roundLog(raw.length, 10)) + '  ' + curOpCode + ' ' + pushData.toString('hex'))
+      var data = pushData.toString('hex') !== '' ? ' ' + pushData.toString('hex') : ''
+
+      code.push(this.pad(pc, this.roundLog(raw.length, 10)) + ' ' + curOpCode + data)
       pushData = ''
     }
     return [ code, codeMap ]

src/index.js

@@ -2,8 +2,8 @@
 var Debugger = require('./Ethdebugger')
 function init () {
   var container = document.getElementById('app')
-  container.vmdebugger = new Debugger()
+  window.vmdebugger = new Debugger()
-  container.appendChild(container.vmdebugger.render())
+  container.appendChild(window.vmdebugger.render())
 }
 
 init()

test-browser/init.js

@@ -1,37 +1,58 @@
-/* global web3Override */
+var init = require('../test/init')
 module.exports = function (browser, callback) {
   extendBrowser(browser)
 
   browser
     .url('http://127.0.0.1:8080')
-  injectScript('./test/resources/testWeb3.js', browser, function () {
+    .waitForElementPresent('#app div', 1000)
+  injectScript('./test/resources/testWeb3.json', browser, function () {
     callback()
   })
 }
 
-function readFile (filename, callback) {
-  var fs = require('fs')
-  try {
-    console.log('reading ' + filename)
-    fs.readFile(filename, 'utf8', callback)
-  } catch (e) {
-    console.log(e)
-    callback(e)
-  }
-}
-
 function injectScript (file, browser, callback) {
-  readFile(file, function (error, result) {
+  init.readFile(file, function (error, result) {
     if (!error) {
       browser.execute(function (data) {
-        eval.call(null, data) // eslint-disable-line
+        // var vmdebugger = window.vmdebugger // document.getElementById('app').vmdebugger
-        var vmdebugger = document.getElementById('app').vmdebugger
+        data = JSON.parse(data)
-        vmdebugger.web3.eth.getCode = web3Override.getCode
+        window.vmdebugger.web3.eth.getCode = function (address, callback) {
-        vmdebugger.web3.debug.traceTransaction = web3Override.traceTransaction
+          if (callback) {
-        vmdebugger.web3.debug.storageAt = web3Override.storageAt
+            callback(null, data.testCodes[address])
-        vmdebugger.web3.eth.getTransaction = web3Override.getTransaction
+          } else {
-        vmdebugger.web3.eth.getTransactionFromBlock = web3Override.getTransactionFromBlock
+            return data.testCodes[address]
-        vmdebugger.web3.eth.getBlockNumber = web3Override.getBlockNumber
+          }
+        }
+
+        window.vmdebugger.web3.debug.traceTransaction = function (txHash, options, callback) {
+          callback(null, data.testTraces[txHash])
+        }
+
+        window.vmdebugger.web3.debug.storageAt = function (blockNumber, txIndex, address, callback) {
+          callback(null, {})
+        }
+
+        window.vmdebugger.web3.eth.getTransaction = function (txHash, callback) {
+          if (callback) {
+            callback(null, data.testTxs[txHash])
+          } else {
+            return data.testTxs[txHash]
+          }
+        }
+
+        window.vmdebugger.web3.eth.getTransactionFromBlock = function (blockNumber, txIndex, callback) {
+          if (callback) {
+            callback(null, data.testTxsByBlock[blockNumber + '-' + txIndex])
+          } else {
+            return data.testTxsByBlock[blockNumber + '-' + txIndex]
+          }
+        }
+
+        window.vmdebugger.web3.eth.getBlockNumber = function (callback) { callback('web3 modified testing purposes :)') }
+
+        window.vmdebugger.web3.eth.getBlockNumber(function (r) {
+          console.log('rrrr' + r)
+        })
       }, [result], function () {
         callback()
       })

test/init.js

@@ -6,6 +6,25 @@ var init = {
     web3.eth.getTransaction = web3Override.getTransaction
     web3.eth.getTransactionFromBlock = web3Override.getTransactionFromBlock
     web3.eth.getBlockNumber = web3Override.getBlockNumber
+  },
+
+  readFile: function (filename, callback) {
+    var fs = require('fs')
+    try {
+      console.log('reading ' + filename)
+      if (callback) {
+        fs.readFile(filename, 'utf8', callback)
+      } else {
+        return fs.readFileSync(filename, 'utf8')
+      }
+    } catch (e) {
+      console.log(e)
+      if (callback) {
+        callback(e)
+      } else {
+        return e
+      }
+    }
   }
 }