replace executionContext for debugger with blockchain object

pull/5370/head
Iuri Matias 5 years ago
parent 56cb2422dc
commit 7e41bd78a2
  1. 2
      src/app.js
  2. 6
      src/app/tabs/debugger-tab.js
  3. 10
      src/app/tabs/debugger/debuggerUI.js

@ -307,7 +307,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
mainview mainview
) )
const analysis = new AnalysisTab(registry) const analysis = new AnalysisTab(registry)
const debug = new DebuggerTab(executionContext) const debug = new DebuggerTab(blockchain)
const test = new TestTab( const test = new TestTab(
registry.get('filemanager').api, registry.get('filemanager').api,
filePanel, filePanel,

@ -21,10 +21,10 @@ const profile = {
class DebuggerTab extends ViewPlugin { class DebuggerTab extends ViewPlugin {
constructor (executionContext) { constructor (blockchain) {
super(profile) super(profile)
this.el = null this.el = null
this.executionContext = executionContext this.blockchain = blockchain
} }
render () { render () {
@ -34,7 +34,7 @@ class DebuggerTab extends ViewPlugin {
<div class="${css.debuggerTabView}" id="debugView"> <div class="${css.debuggerTabView}" id="debugView">
<div id="debugger" class="${css.debugger}"></div> <div id="debugger" class="${css.debugger}"></div>
</div>` </div>`
this.debuggerUI = new DebuggerUI(this.el.querySelector('#debugger'), this.executionContext) this.debuggerUI = new DebuggerUI(this.el.querySelector('#debugger'), this.blockchain)
return this.el return this.el
} }

@ -30,9 +30,9 @@ var css = csjs`
class DebuggerUI { class DebuggerUI {
constructor (container, executionContext) { constructor (container, blockchain) {
this.registry = globalRegistry this.registry = globalRegistry
this.executionContext = executionContext this.blockchain = blockchain
this.event = new EventManager() this.event = new EventManager()
this.isActive = false this.isActive = false
@ -105,13 +105,13 @@ class DebuggerUI {
getDebugWeb3 () { getDebugWeb3 () {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.executionContext.detectNetwork((error, network) => { this.blockchain.detectNetwork((error, network) => {
let web3 let web3
if (error || !network) { if (error || !network) {
web3 = init.web3DebugNode(this.executionContext.web3()) web3 = init.web3DebugNode(this.blockchain.web3())
} else { } else {
const webDebugNode = init.web3DebugNode(network.name) const webDebugNode = init.web3DebugNode(network.name)
web3 = !webDebugNode ? this.executionContext.web3() : webDebugNode web3 = !webDebugNode ? this.blockchain.web3() : webDebugNode
} }
init.extendWeb3(web3) init.extendWeb3(web3)
resolve(web3) resolve(web3)

Loading…
Cancel
Save