Merge pull request #709 from ethereum/fixDeployLibrary

remix-debugger/nightwatch.js

@@ -62,8 +62,8 @@ module.exports = {
       'desiredCapabilities': {
         'browserName': 'safari',
         'javascriptEnabled': true,
-        'platform': 'OS X 10.10',
-        'version': '8.0',
+        'platform': 'OS X 10.11',
+        'version': '10.0',
         'acceptSslCerts': true,
         'build': 'build-' + TRAVIS_JOB_NUMBER,
         'tunnel-identifier': 'remix_tests_' + TRAVIS_JOB_NUMBER

remix-debugger/package.json

@@ -56,7 +56,7 @@
     "nightwatch_remote_chrome": "nightwatch --config nightwatch.js --env chrome",
     "nightwatch_remote_firefox": "nightwatch --config nightwatch.js --env default",
     "nightwatch_remote_ie": "nightwatch --config nightwatch.js --env ie",
-    "nightwatch_remote_parallel": "nightwatch --config nightwatch.js --env ie,safari,chrome,default",
+    "nightwatch_remote_parallel": "nightwatch --config nightwatch.js --env safari,chrome,default",
     "nightwatch_remote_safari": "nightwatch --config nightwatch.js --env safari",
     "onchange": "onchange build/app.js -- npm run lint",
     "selenium": "selenium-standalone start",

remix-debugger/src/ui/Ethdebugger.js

@@ -25,7 +25,11 @@ var css = csjs`
     margin-left: 10px;
   }
 `
-function Ethdebugger () {
+
+function Ethdebugger (opts) {
+  this.opts = opts || {}
+  if (!this.opts.compilationResult) this.opts.compilationResult = () => { return null }
+
   var self = this
   this.event = new EventManager()
 
@@ -107,6 +111,7 @@ Ethdebugger.prototype.setCompilationResult = function (compilationResult) {
 }
 
 Ethdebugger.prototype.debug = function (tx) {
+  this.setCompilationResult(this.opts.compilationResult())
   if (tx instanceof Object) {
     this.txBrowser.load(tx.hash)
   } else if (tx instanceof String) {
@@ -145,6 +150,7 @@ Ethdebugger.prototype.startDebugging = function (blockNumber, txIndex, tx) {
   if (this.traceManager.isLoading) {
     return
   }
+  this.setCompilationResult(this.opts.compilationResult())
   this.statusMessage = 'Loading trace...'
   yo.update(this.view, this.render())
   console.log('loading trace...')