From bbfb0aa500908faa7fd8ca84be22c9cf9c537ea8 Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Wed, 5 Sep 2018 17:58:51 -0400 Subject: [PATCH] remove all code related to displayConnectionSetting since it's always false --- src/app/debugger/debuggerUI.js | 2 +- src/app/debugger/debuggerUI/TxBrowser.js | 37 +----------------------- 2 files changed, 2 insertions(+), 37 deletions(-) diff --git a/src/app/debugger/debuggerUI.js b/src/app/debugger/debuggerUI.js index 33bfd698c6..ecdd1923cd 100644 --- a/src/app/debugger/debuggerUI.js +++ b/src/app/debugger/debuggerUI.js @@ -40,7 +40,7 @@ class DebuggerUI { startTxBrowser () { const self = this - let txBrowser = new TxBrowser(this.debugger_ui, {displayConnectionSetting: false, web3: executionContext.web3()}) + let txBrowser = new TxBrowser(this.debugger_ui, {web3: executionContext.web3()}) this.debugger_ui.txBrowser = txBrowser txBrowser.event.register('newTxLoading', this, function () { diff --git a/src/app/debugger/debuggerUI/TxBrowser.js b/src/app/debugger/debuggerUI/TxBrowser.js index 65e36cb9b7..9205bace02 100644 --- a/src/app/debugger/debuggerUI/TxBrowser.js +++ b/src/app/debugger/debuggerUI/TxBrowser.js @@ -2,7 +2,6 @@ var remixLib = require('remix-lib') var EventManager = remixLib.EventManager var traceHelper = remixLib.helpers.trace var yo = require('yo-yo') -var init = remixLib.init var csjs = require('csjs-inject') var styleGuide = require('../../ui/styles-guide/theme-chooser') var styles = styleGuide.chooser() @@ -53,11 +52,11 @@ function TxBrowser (_parent, opts) { this.blockNumber this.txNumber this.view - this.displayConnectionSetting = opts.displayConnectionSetting this.web3 = opts.web3 var self = this _parent.event.register('providerChanged', this, function (provider) { self.setDefaultValues() + // TODO: looks redudant since setDefaultValues already re-renders if (self.view) { yo.update(self.view, self.render()) } @@ -120,30 +119,6 @@ TxBrowser.prototype.update = function (error, tx) { } } -TxBrowser.prototype.updateWeb3Url = function (newhost) { - init.setProvider(global.web3, newhost) - var self = this - this.checkWeb3(function (error, block) { - if (!error) { - self.connectInfo = 'Connected to ' + global.web3.currentProvider.host + '. Current block number: ' + block - } else { - self.connectInfo = 'Unable to connect to ' + global.web3.currentProvider.host + '. ' + error.message - } - yo.update(self.view, self.render()) - }) -} - -TxBrowser.prototype.checkWeb3 = function (callback) { - try { - global.web3.eth.getBlockNumber(function (error, block) { - callback(error, block) - }) - } catch (e) { - console.log(e) - callback(e.message, null) - } -} - TxBrowser.prototype.updateBlockN = function (ev) { this.blockNumber = ev.target.value } @@ -166,19 +141,9 @@ TxBrowser.prototype.init = function (ev) { this.setDefaultValues() } -TxBrowser.prototype.connectionSetting = function () { - if (this.displayConnectionSetting) { - var self = this - return yo`
Node URL: - ${this.connectInfo}
` - } - return '' -} - TxBrowser.prototype.render = function () { var self = this var view = yo`
- ${this.connectionSetting()}