refactor getSourceLocationFromVMTraceIndex to a promise

459e045e · Iuri Matias · aniket-engg · 0f4f699d · 459e045e
Commit 459e045e authored Jul 05, 2020 by Iuri Matias Committed by aniket-engg Aug 25, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 10 deletions

internalCallTree.js libs/remix-debug/src/solidity-decoder/internalCallTree.js +11 -10

No files found.
--- a/libs/remix-debug/src/solidity-decoder/internalCallTree.js
+++ b/libs/remix-debug/src/solidity-decoder/internalCallTree.js
@@ -126,18 +126,19 @@ class InternalCallTree {

  extractSourceLocation (step) {
    return new Promise((resolve, reject) => {
-      try {
-        const address = this.traceManager.getCurrentCalledAddressAt(step)
-        try {
-          this.sourceLocationTracker.getSourceLocationFromVMTraceIndex(address, step, this.solidityProxy.contracts).then(resolve).catch((error) => {
-            return reject('InternalCallTree - Cannot retrieve sourcelocation for step ' + step + ' ' + error)
-          })
-        } catch (error) {
+      this.traceManager.getCurrentCalledAddressAt(step, (error, address) => {
+        if (!error) {
+          try {
+            this.sourceLocationTracker.getSourceLocationFromVMTraceIndex(address, step, this.solidityProxy.contracts).then(resolve).catch((error) => {
+              return reject('InternalCallTree - Cannot retrieve sourcelocation for step ' + step + ' ' + error)
+            })
+          } catch (error) {
+            return reject('InternalCallTree - Cannot retrieve address for step ' + step + ' ' + error)
+          }
+        } else {
          return reject('InternalCallTree - Cannot retrieve address for step ' + step + ' ' + error)
        }
-      } catch (error) {
-        return reject('InternalCallTree - Cannot retrieve address for step ' + step + ' ' + error)
-      }
+      })
    })
  }