diff --git a/libs/remix-debug/src/debugger/VmDebugger.js b/libs/remix-debug/src/debugger/VmDebugger.js index 8c3226203b..862d6637d0 100644 --- a/libs/remix-debug/src/debugger/VmDebugger.js +++ b/libs/remix-debug/src/debugger/VmDebugger.js @@ -160,11 +160,9 @@ class VmDebuggerLogic { this.traceLength = 0 this.debugger.event.register('newTraceLoaded', (length) => { - this._traceManager.getAddresses((error, addresses) => { - if (error) return - this.event.trigger('traceAddressesUpdate', [addresses]) - this.addresses = addresses - }) + const addresses = this._traceManager.getAddresses() + this.event.trigger('traceAddressesUpdate', [addresses]) + this.addresses = addresses this._traceManager.getLength((error, length) => { if (error) return diff --git a/libs/remix-lib/src/trace/traceManager.js b/libs/remix-lib/src/trace/traceManager.js index 8ecc2193e7..0d7bdf3c58 100644 --- a/libs/remix-lib/src/trace/traceManager.js +++ b/libs/remix-lib/src/trace/traceManager.js @@ -84,8 +84,8 @@ TraceManager.prototype.accumulateStorageChanges = function (index, address, stor return this.traceCache.accumulateStorageChanges(index, address, storageOrigin) } -TraceManager.prototype.getAddresses = function (callback) { - callback(null, this.traceCache.addresses) +TraceManager.prototype.getAddresses = function () { + return this.traceCache.addresses } TraceManager.prototype.getCallDataAt = function (stepIndex, callback) { diff --git a/libs/remix-lib/test/traceManager.js b/libs/remix-lib/test/traceManager.js index 6bec9d8231..64a2b64055 100644 --- a/libs/remix-lib/test/traceManager.js +++ b/libs/remix-lib/test/traceManager.js @@ -278,15 +278,10 @@ tape('TraceManager', function (t) { }) t.test('TraceManager.getAddresses', function (st) { - traceManager.getAddresses(function (error, result) { - if (error) { - st.fail(error) - } else { - st.ok(result[0] === '0x0d3a18d64dfe4f927832ab58d6451cecc4e517c5') - st.ok(result[1] === '(Contract Creation - Step 63)') - st.end() - } - }) + const result = traceManager.getAddresses() + st.ok(result[0] === '0x0d3a18d64dfe4f927832ab58d6451cecc4e517c5') + st.ok(result[1] === '(Contract Creation - Step 63)') + st.end() }) t.test('TraceManager.getReturnValue', function (st) {