From 9ce1849e29e550f5f7be49c7869d70e24d236df0 Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Tue, 31 Dec 2019 11:56:42 -0500 Subject: [PATCH] move executionContext initialization to blockchain object --- src/app.js | 4 +--- src/app/tabs/runTab/model/blockchain.js | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/app.js b/src/app.js index fedec3572e..35273fae19 100644 --- a/src/app.js +++ b/src/app.js @@ -23,8 +23,6 @@ var toolTip = require('./app/ui/tooltip') var CompilerMetadata = require('./app/files/compiler-metadata') var CompilerImport = require('./app/compiler/compiler-imports') -var executionContext = remixLib.execution.executionContext - const Blockchain = require('./app/tabs/runTab/model/blockchain.js') const PluginManagerComponent = require('./app/components/plugin-manager-component') @@ -225,7 +223,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org const fileManager = new FileManager(editor) registry.put({api: fileManager, name: 'filemanager'}) - const blockchain = new Blockchain(registry.get('config').api, executionContext) + const blockchain = new Blockchain(registry.get('config').api) // ----------------- compilation metadata generation servive ---------------------------- const compilerMetadataGenerator = new CompilerMetadata(blockchain, fileManager, registry.get('config').api) diff --git a/src/app/tabs/runTab/model/blockchain.js b/src/app/tabs/runTab/model/blockchain.js index e98ab93511..272b7a1afe 100644 --- a/src/app/tabs/runTab/model/blockchain.js +++ b/src/app/tabs/runTab/model/blockchain.js @@ -4,6 +4,7 @@ const txExecution = remixLib.execution.txExecution const typeConversion = remixLib.execution.typeConversion const Txlistener = remixLib.execution.txListener const EventManager = remixLib.EventManager +const executionContext = remixLib.execution.executionContext const ethJSUtil = require('ethereumjs-util') const Personal = require('web3-eth-personal') const Web3 = require('web3') @@ -13,7 +14,7 @@ import { UniversalDApp } from 'remix-lib' class Blockchain { // NOTE: the config object will need to be refactored out in remix-lib - constructor (config, executionContext) { + constructor (config) { this.event = new EventManager() this.executionContext = executionContext this.udapp = new UniversalDApp(config, this.executionContext)