put includion of variable declaration in a separate function

src/util/internalCallTree.js

@@ -109,23 +109,7 @@ async function buildTree (tree, step, scopeId) {
       return { outStep: step + 1 }
     } else {
       if (tree.includeLocalVariables) {
-        var variableDeclaration = resolveVariableDeclaration(tree, step, sourceLocation)
-        if (variableDeclaration && !tree.scopes[scopeId].locals[variableDeclaration.attributes.name]) {
-          tree.traceManager.getStackAt(step, (error, stack) => {
-            if (!error) {
-              tree.solidityProxy.contractNameAt(step, (error, contractName) => { // cached
-                if (!error) {
-                  var states = tree.solidityProxy.extractStatesDefinitions()
-                  tree.scopes[scopeId].locals[variableDeclaration.attributes.name] = {
-                    name: variableDeclaration.attributes.name,
-                    type: decodeInfo.parseType(variableDeclaration.attributes.type, states, contractName),
-                    stackHeight: stack.length
-                  }
-                }
-              })
-            }
-          })
-        }
+        includeVariableDeclaration(tree, step, sourceLocation, scopeId)
       }
       step++
     }
@@ -133,6 +117,26 @@ async function buildTree (tree, step, scopeId) {
   return { outStep: step }
 }
 
+function includeVariableDeclaration (tree, step, sourceLocation, scopeId) {
+  var variableDeclaration = resolveVariableDeclaration(tree, step, sourceLocation)
+  if (variableDeclaration && !tree.scopes[scopeId].locals[variableDeclaration.attributes.name]) {
+    tree.traceManager.getStackAt(step, (error, stack) => {
+      if (!error) {
+        tree.solidityProxy.contractNameAt(step, (error, contractName) => { // cached
+          if (!error) {
+            var states = tree.solidityProxy.extractStatesDefinitions()
+            tree.scopes[scopeId].locals[variableDeclaration.attributes.name] = {
+              name: variableDeclaration.attributes.name,
+              type: decodeInfo.parseType(variableDeclaration.attributes.type, states, contractName),
+              stackHeight: stack.length
+            }
+          }
+        })
+      }
+    })
+  }
+}
+
 function extractSourceLocation (tree, step) {
   return new Promise(function (resolve, reject) {
     tree.traceManager.getCurrentCalledAddressAt(step, (error, address) => {