update references to parent debugger

pull/1/head
Iuri Matias 6 years ago committed by yann300
parent 1cd738d889
commit cdbd71143f
  1. 21
      src/app/debugger/debugger/VmDebugger.js

@ -13,7 +13,7 @@ class VmDebuggerLogic {
constructor (_parentUI, tx, _stepManager, _traceManager, _codeManager, _solidityProxy, _callTree) { constructor (_parentUI, tx, _stepManager, _traceManager, _codeManager, _solidityProxy, _callTree) {
this.event = new EventManager() this.event = new EventManager()
this._parentUI = _parentUI this._parentUI = _parentUI
this._parent = this._parentUI.debugger this.debugger = this._parentUI.debugger
this.stepManager = _stepManager this.stepManager = _stepManager
this._traceManager = _traceManager this._traceManager = _traceManager
this._codeManager = _codeManager this._codeManager = _codeManager
@ -34,22 +34,21 @@ class VmDebuggerLogic {
this.listenToNewChanges() this.listenToNewChanges()
this.listenToSolidityStateEvents() this.listenToSolidityStateEvents()
this.listenToSolidityLocalsEvents() this.listenToSolidityLocalsEvents()
} }
listenToEvents () { listenToEvents () {
const self = this const self = this
this._parent.event.register('traceUnloaded', function () { this.debugger.event.register('traceUnloaded', function () {
self.event.trigger('traceUnloaded') self.event.trigger('traceUnloaded')
}) })
// TODO: is it the same? // TODO: is it the same?
this._parentUI.debugger.event.register('traceUnloaded', function () { this.debugger.event.register('traceUnloaded', function () {
self.event.trigger('traceUnloaded') self.event.trigger('traceUnloaded')
}) })
this._parentUI.debugger.event.register('newTraceLoaded', function () { this.debugger.event.register('newTraceLoaded', function () {
self.event.trigger('newTraceLoaded') self.event.trigger('newTraceLoaded')
}) })
} }
@ -159,7 +158,7 @@ class VmDebuggerLogic {
this.address = [] this.address = []
this.traceLength = 0 this.traceLength = 0
self._parentUI.debugger.event.register('newTraceLoaded', function (length) { self.debugger.event.register('newTraceLoaded', function (length) {
self._traceManager.getAddresses(function (error, addresses) { self._traceManager.getAddresses(function (error, addresses) {
if (error) return if (error) return
self.event.trigger('traceAddressesUpdate', [addresses]) self.event.trigger('traceAddressesUpdate', [addresses])
@ -173,7 +172,7 @@ class VmDebuggerLogic {
}) })
}) })
self._parentUI.debugger.event.register('indexChanged', this, function (index) { self.debugger.event.register('indexChanged', this, function (index) {
if (index < 0) return if (index < 0) return
if (self.stepManager.currentStepIndex !== index) return if (self.stepManager.currentStepIndex !== index) return
if (!self.storageResolver) return if (!self.storageResolver) return
@ -197,8 +196,8 @@ class VmDebuggerLogic {
listenToNewChanges () { listenToNewChanges () {
const self = this const self = this
self._parent.event.register('newTraceLoaded', this, function () { self.debugger.event.register('newTraceLoaded', this, function () {
self.storageResolver = new StorageResolver({web3: self._parent.web3}) self.storageResolver = new StorageResolver({web3: self.debugger.web3})
self.debuggerSolidityState.storageResolver = self.storageResolver self.debuggerSolidityState.storageResolver = self.storageResolver
self.debuggerSolidityLocals.storageResolver = self.storageResolver self.debuggerSolidityLocals.storageResolver = self.storageResolver
@ -209,8 +208,8 @@ class VmDebuggerLogic {
self.event.trigger('newTrace', []) self.event.trigger('newTrace', [])
}) })
self._parent.event.register('callTreeReady', function () { self.debugger.event.register('callTreeReady', function () {
if (self._parent.callTree.reducedTrace.length) { if (self.debugger.callTree.reducedTrace.length) {
return self.event.trigger('newCallTree', []) return self.event.trigger('newCallTree', [])
} }
}) })

Loading…
Cancel
Save