From 3ae5157e47c3fb89ceb4621ff6fc80dde35af0e4 Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Wed, 26 Sep 2018 17:39:11 -0400 Subject: [PATCH] Revert "Delay contract deploiement if share bytecode" This reverts commit 527dbcca8b4bcdcb196ff7d6dbfcbc3cb40420ba. --- lib/modules/blockchain_connector/index.js | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/lib/modules/blockchain_connector/index.js b/lib/modules/blockchain_connector/index.js index 4ea5e1430..eda9d2463 100644 --- a/lib/modules/blockchain_connector/index.js +++ b/lib/modules/blockchain_connector/index.js @@ -20,7 +20,6 @@ class BlockchainConnector { this.isDev = options.isDev; this.web3Endpoint = ''; this.isWeb3Ready = false; - this.deployers = {}; self.events.setCommandHandler("blockchain:web3:isReady", (cb) => { cb(self.isWeb3Ready); @@ -233,29 +232,9 @@ class BlockchainConnector { } deployContractFromObject(deployContractObject, params, cb) { - let deployer = this.deployers[deployContractObject._deployData]; - - if (!deployer) { - deployer = {running: false, requested: []}; - this.deployers[deployContractObject._deployData] = deployer; - } - - if (deployer.running) { - deployer.requested.push({deployContractObject, params, cb}); - return; - } - - deployer.running = true; embarkJsUtils.secureSend(this.web3, deployContractObject, { from: params.from, gas: params.gas, gasPrice: params.gasPrice - }, true, (error, receipt) => { - deployer.running = false; - if (deployer.requested.length > 0) { - let request = deployer.requested.shift(); - this.deployContractFromObject(request.deployContractObject, request.params, request.cb); - } - cb(error, receipt); - }); + }, true, cb); } determineDefaultAccount(cb) {