From c37caa9dc630e2fefe3caac7feb286108229f460 Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Sun, 30 Aug 2020 09:32:52 -0400 Subject: [PATCH] pass getCode to SolidityProxy --- libs/remix-debug/src/Ethdebugger.js | 4 ++-- libs/remix-debug/src/solidity-decoder/solidityProxy.js | 6 +++--- libs/remix-debug/test/decoder/localsTests/int.js | 2 +- libs/remix-debug/test/decoder/localsTests/misc.js | 2 +- libs/remix-debug/test/decoder/localsTests/misc2.js | 2 +- libs/remix-debug/test/decoder/localsTests/structArray.js | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libs/remix-debug/src/Ethdebugger.js b/libs/remix-debug/src/Ethdebugger.js index 2bcbb5f036..e2fab2af4b 100644 --- a/libs/remix-debug/src/Ethdebugger.js +++ b/libs/remix-debug/src/Ethdebugger.js @@ -33,7 +33,7 @@ function Ethdebugger (opts) { this.traceManager = new TraceManager({web3: this.web3}) this.codeManager = new CodeManager(this.traceManager) - this.solidityProxy = new SolidityProxy(this.traceManager, this.codeManager) + this.solidityProxy = new SolidityProxy({traceManager: this.traceManager, getCode: this.codeManager.getCode.bind(this.codeManager)}) this.storageResolver = null this.callTree = new InternalCallTree(this.event, this.traceManager, this.solidityProxy, this.codeManager, { includeLocalVariables: true }) @@ -42,7 +42,7 @@ function Ethdebugger (opts) { Ethdebugger.prototype.setManagers = function () { this.traceManager = new TraceManager({web3: this.web3}) this.codeManager = new CodeManager(this.traceManager) - this.solidityProxy = new SolidityProxy(this.traceManager, this.codeManager) + this.solidityProxy = new SolidityProxy({traceManager: this.traceManager, getCode: this.codeManager.getCode.bind(this.codeManager)}) this.storageResolver = null this.callTree = new InternalCallTree(this.event, this.traceManager, this.solidityProxy, this.codeManager, { includeLocalVariables: true }) diff --git a/libs/remix-debug/src/solidity-decoder/solidityProxy.js b/libs/remix-debug/src/solidity-decoder/solidityProxy.js index 103d6442d9..a0cb434064 100644 --- a/libs/remix-debug/src/solidity-decoder/solidityProxy.js +++ b/libs/remix-debug/src/solidity-decoder/solidityProxy.js @@ -6,11 +6,11 @@ const astHelper = require('./astHelper') const util = remixLib.util class SolidityProxy { - constructor (traceManager, codeManager) { + constructor ({traceManager, getCode}) { this.cache = new Cache() this.reset({}) this.traceManager = traceManager - this.codeManager = codeManager + this.getCode = getCode } /** @@ -44,7 +44,7 @@ class SolidityProxy { if (this.cache.contractNameByAddress[address]) { return this.cache.contractNameByAddress[address] } - const code = await this.codeManager.getCode(address) + const code = await this.getCode(address) const contractName = contractNameFromCode(this.contracts, code.bytecode, address) this.cache.contractNameByAddress[address] = contractName return contractName diff --git a/libs/remix-debug/test/decoder/localsTests/int.js b/libs/remix-debug/test/decoder/localsTests/int.js index 6bf65b6d20..0cae151eb0 100644 --- a/libs/remix-debug/test/decoder/localsTests/int.js +++ b/libs/remix-debug/test/decoder/localsTests/int.js @@ -25,7 +25,7 @@ module.exports = function (st, vm, privateKey, contractBytecode, compilationResu var traceManager = new TraceManager({web3: vm.web3}) var codeManager = new CodeManager(traceManager) codeManager.clear() - var solidityProxy = new SolidityProxy(traceManager, 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 }) diff --git a/libs/remix-debug/test/decoder/localsTests/misc.js b/libs/remix-debug/test/decoder/localsTests/misc.js index 2b6529b375..c085a6b21e 100644 --- a/libs/remix-debug/test/decoder/localsTests/misc.js +++ b/libs/remix-debug/test/decoder/localsTests/misc.js @@ -22,7 +22,7 @@ module.exports = function (st, vm, privateKey, contractBytecode, compilationResu var traceManager = new TraceManager({web3: vm.web3}) var codeManager = new CodeManager(traceManager) codeManager.clear() - var solidityProxy = new SolidityProxy(traceManager, 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 }) diff --git a/libs/remix-debug/test/decoder/localsTests/misc2.js b/libs/remix-debug/test/decoder/localsTests/misc2.js index 3718eed77f..871aaf52d7 100644 --- a/libs/remix-debug/test/decoder/localsTests/misc2.js +++ b/libs/remix-debug/test/decoder/localsTests/misc2.js @@ -23,7 +23,7 @@ module.exports = function (st, vm, privateKey, contractBytecode, compilationResu var traceManager = new TraceManager({web3: vm.web3}) var codeManager = new CodeManager(traceManager) codeManager.clear() - var solidityProxy = new SolidityProxy(traceManager, 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 }) diff --git a/libs/remix-debug/test/decoder/localsTests/structArray.js b/libs/remix-debug/test/decoder/localsTests/structArray.js index 3dbef57e7c..f9a6a85c85 100644 --- a/libs/remix-debug/test/decoder/localsTests/structArray.js +++ b/libs/remix-debug/test/decoder/localsTests/structArray.js @@ -22,7 +22,7 @@ module.exports = function (st, vm, privateKey, contractBytecode, compilationResu var traceManager = new TraceManager({web3: vm.web3}) var codeManager = new CodeManager(traceManager) codeManager.clear() - var solidityProxy = new SolidityProxy(traceManager, 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 })