remove unnecessary extra levels from localTests

libs/remix-debug/test/decoder/localsTests/helper.js

@@ -25,13 +25,12 @@ function decodeLocal (st, index, traceManager, callTree, verifier) {
       }],
       index,
       function (error, result) {
-        if (!error) {
-          localDecoder.solidityLocals(index, callTree, result[0].value, result[1].value, {}, {start: 5000}).then((locals) => {
+        if (error) {
+          return st.fail(error)
+        }
+        localDecoder.solidityLocals(index, callTree, result[0].value, result[1].value, {}, { start: 5000 }).then((locals) => {
           verifier(locals)
         })
-        } else {
-          st.fail(error)
-        }
       })
   } catch (e) {
     st.fail(e.message)

libs/remix-debug/test/decoder/localsTests/int.js

@@ -13,19 +13,19 @@ var EventManager = require('../../../src/eventManager')
 var helper = require('./helper')
 
 module.exports = function (st, vm, privateKey, contractBytecode, compilationResult, cb) {
-  vmCall.sendTx(vm, {nonce: 0, privateKey: privateKey}, null, 0, contractBytecode, function (error, txHash) {
+  vmCall.sendTx(vm, { nonce: 0, privateKey: privateKey }, null, 0, contractBytecode, function (error, txHash) {
     if (error) {
-      st.fail(error)
-    } else {
+      return st.fail(error)
+    }
     vm.web3.eth.getTransaction(txHash, function (error, tx) {
       if (error) {
-          st.fail(error)
-        } else {
+        return st.fail(error)
+      }
       tx.to = traceHelper.contractCreationToken('0')
-          var traceManager = new TraceManager({web3: vm.web3})
+      var traceManager = new TraceManager({ web3: vm.web3 })
       var codeManager = new CodeManager(traceManager)
       codeManager.clear()
-          var solidityProxy = new SolidityProxy({traceManager, getCode: codeManager.getCode.bind(codeManager)})
+      var solidityProxy = new SolidityProxy({ traceManager, getCode: codeManager.getCode.bind(codeManager) })
       solidityProxy.reset(compilationResult)
       var debuggerEvent = new EventManager()
       var callTree = new InternalCallTree(debuggerEvent, traceManager, solidityProxy, codeManager, { includeLocalVariables: true })
@@ -44,6 +44,7 @@ module.exports = function (st, vm, privateKey, contractBytecode, compilationResu
           st.equals(functions1.length, 1)
           st.equals(functions2.length, 2)
           st.equals(functions3.length, 0)
+
           st.equals(Object.keys(functions1[0])[0], 'functionDefinition')
           st.equals(Object.keys(functions1[0])[1], 'inputs')
           st.equals(functions1[0].inputs[0], 'foo')
@@ -123,9 +124,7 @@ module.exports = function (st, vm, privateKey, contractBytecode, compilationResu
       }).catch((error) => {
         st.fail(error)
       })
-        }
     })
-    }
   })
 }
 

libs/remix-debug/test/decoder/localsTests/misc.js

@@ -10,19 +10,19 @@ var TraceManager = require('../../../src/trace/traceManager')
 var CodeManager = require('../../../src/code/codeManager')
 
 module.exports = function (st, vm, privateKey, contractBytecode, compilationResult, cb) {
-  vmCall.sendTx(vm, {nonce: 0, privateKey: privateKey}, null, 0, contractBytecode, function (error, txHash) {
+  vmCall.sendTx(vm, { nonce: 0, privateKey: privateKey }, null, 0, contractBytecode, function (error, txHash) {
     if (error) {
-      st.fail(error)
-    } else {
+      return st.fail(error)
+    }
     vm.web3.eth.getTransaction(txHash, function (error, tx) {
       if (error) {
-          st.fail(error)
-        } else {
+        return st.fail(error)
+      }
       tx.to = traceHelper.contractCreationToken('0')
-          var traceManager = new TraceManager({web3: vm.web3})
+      var traceManager = new TraceManager({ web3: vm.web3 })
       var codeManager = new CodeManager(traceManager)
       codeManager.clear()
-          var solidityProxy = new SolidityProxy({traceManager, getCode: codeManager.getCode.bind(codeManager)})
+      var solidityProxy = new SolidityProxy({ traceManager, getCode: codeManager.getCode.bind(codeManager) })
       solidityProxy.reset(compilationResult)
       var debuggerEvent = new EventManager()
       var callTree = new InternalCallTree(debuggerEvent, traceManager, solidityProxy, codeManager, { includeLocalVariables: true })
@@ -69,8 +69,6 @@ module.exports = function (st, vm, privateKey, contractBytecode, compilationResu
       }).catch((error) => {
         st.fail(error)
       })
-        }
     })
-    }
   })
 }

libs/remix-debug/test/decoder/localsTests/misc2.js

@@ -11,19 +11,19 @@ var TraceManager = require('../../../src/trace/traceManager')
 var CodeManager = require('../../../src/code/codeManager')
 
 module.exports = function (st, vm, privateKey, contractBytecode, compilationResult, cb) {
-  vmCall.sendTx(vm, {nonce: 0, privateKey: privateKey}, null, 0, contractBytecode, function (error, txHash) {
+  vmCall.sendTx(vm, { nonce: 0, privateKey: privateKey }, null, 0, contractBytecode, function (error, txHash) {
     if (error) {
-      st.fail(error)
-    } else {
+      return st.fail(error)
+    }
     vm.web3.eth.getTransaction(txHash, function (error, tx) {
       if (error) {
-          st.fail(error)
-        } else {
+        return st.fail(error)
+      }
       tx.to = traceHelper.contractCreationToken('0')
-          var traceManager = new TraceManager({web3: vm.web3})
+      var traceManager = new TraceManager({ web3: vm.web3 })
       var codeManager = new CodeManager(traceManager)
       codeManager.clear()
-          var solidityProxy = new SolidityProxy({traceManager, getCode: codeManager.getCode.bind(codeManager)})
+      var solidityProxy = new SolidityProxy({ traceManager, getCode: codeManager.getCode.bind(codeManager) })
       solidityProxy.reset(compilationResult)
       var debuggerEvent = new EventManager()
       var callTree = new InternalCallTree(debuggerEvent, traceManager, solidityProxy, codeManager, { includeLocalVariables: true })
@@ -56,8 +56,6 @@ module.exports = function (st, vm, privateKey, contractBytecode, compilationResu
       }).catch((error) => {
         st.fail(error)
       })
-        }
     })
-    }
   })
 }

libs/remix-debug/test/decoder/localsTests/structArray.js

@@ -10,19 +10,19 @@ var TraceManager = require('../../../src/trace/traceManager')
 var CodeManager = require('../../../src/code/codeManager')
 
 module.exports = function (st, vm, privateKey, contractBytecode, compilationResult, cb) {
-  vmCall.sendTx(vm, {nonce: 0, privateKey: privateKey}, null, 0, contractBytecode, function (error, txHash) {
+  vmCall.sendTx(vm, { nonce: 0, privateKey: privateKey }, null, 0, contractBytecode, function (error, txHash) {
     if (error) {
-      st.fail(error)
-    } else {
+      return st.fail(error)
+    }
     vm.web3.eth.getTransaction(txHash, function (error, tx) {
       if (error) {
-          st.fail(error)
-        } else {
+        return st.fail(error)
+      }
       tx.to = traceHelper.contractCreationToken('0')
-          var traceManager = new TraceManager({web3: vm.web3})
+      var traceManager = new TraceManager({ web3: vm.web3 })
       var codeManager = new CodeManager(traceManager)
       codeManager.clear()
-          var solidityProxy = new SolidityProxy({traceManager, getCode: codeManager.getCode.bind(codeManager)})
+      var solidityProxy = new SolidityProxy({ traceManager, getCode: codeManager.getCode.bind(codeManager) })
       solidityProxy.reset(compilationResult)
       var debuggerEvent = new EventManager()
       var callTree = new InternalCallTree(debuggerEvent, traceManager, solidityProxy, codeManager, { includeLocalVariables: true })
@@ -113,8 +113,6 @@ module.exports = function (st, vm, privateKey, contractBytecode, compilationResu
       }).catch((error) => {
         st.fail(error)
       })
-        }
     })
-    }
   })
 }