From 5bcb215d8995c1e96fb6e6e326b4befe83173655 Mon Sep 17 00:00:00 2001 From: yann300 Date: Thu, 12 Nov 2020 10:26:29 +0100 Subject: [PATCH] make getTrace async --- apps/remix-ide/src/app/tabs/debugger-tab.js | 46 ++++++++++----------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/apps/remix-ide/src/app/tabs/debugger-tab.js b/apps/remix-ide/src/app/tabs/debugger-tab.js index 41032c9393..7438ab8883 100644 --- a/apps/remix-ide/src/app/tabs/debugger-tab.js +++ b/apps/remix-ide/src/app/tabs/debugger-tab.js @@ -104,31 +104,29 @@ class DebuggerTab extends ViewPlugin { }) } - getTrace (hash) { + async getTrace (hash) { if (!hash) return - return new Promise(async (resolve, reject) => { /* eslint-disable-line */ - try { - const web3 = await this.getDebugWeb3() - const currentReceipt = await web3.eth.getTransactionReceipt(hash) - const debug = new Debugger({ - web3, - offsetToLineColumnConverter: this.offsetToLineColumnConverter, - compilationResult: async (address) => { - try { - return await this.fetchContractAndCompile(address, currentReceipt) - } catch (e) { - console.error(e) - } - return null - }, - debugWithGeneratedSources: false - }) - - resolve(await debug.debugger.traceManager.getTrace(hash)) - } catch (e) { - reject(e) - } - }) + try { + const web3 = await this.getDebugWeb3() + const currentReceipt = await web3.eth.getTransactionReceipt(hash) + const debug = new Debugger({ + web3, + offsetToLineColumnConverter: this.offsetToLineColumnConverter, + compilationResult: async (address) => { + try { + return await this.fetchContractAndCompile(address, currentReceipt) + } catch (e) { + console.error(e) + } + return null + }, + debugWithGeneratedSources: false + }) + + return await debug.debugger.traceManager.getTrace(hash) + } catch (e) { + throw e + } } fetchContractAndCompile (address, receipt) {