From 55c001dedab1be7ddeb0fa29e5824217e82b12fe Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Thu, 26 Jul 2018 12:58:25 -0400 Subject: [PATCH] cleanup --- lib/contracts/blockchain.js | 15 --------------- lib/contracts/deploy_manager.js | 18 +++++++++--------- lib/core/events.js | 1 + lib/modules/blockchain_process/index.js | 14 -------------- lib/modules/graph/index.js | 1 + test/contracts.js | 3 --- 6 files changed, 11 insertions(+), 41 deletions(-) diff --git a/lib/contracts/blockchain.js b/lib/contracts/blockchain.js index 5ca10db7..104e6131 100644 --- a/lib/contracts/blockchain.js +++ b/lib/contracts/blockchain.js @@ -21,8 +21,6 @@ class Blockchain { this.web3StartedInProcess = false; self.events.setCommandHandler("blockchain:web3:isReady", (cb) => { - console.dir("geting state of web3"); - console.dir(self.isWeb3Ready.toString()); cb(self.isWeb3Ready); }); @@ -45,7 +43,6 @@ class Blockchain { if (this.contractsConfig.deployment.type !== "rpc" && this.contractsConfig.deployment.type !== "ws") { const message = __("contracts config error: unknown deployment type %s", this.contractsConfig.deployment.type); this.logger.error(message); - //return cb(message); } const protocol = (this.contractsConfig.deployment.type === "rpc") ? this.contractsConfig.deployment.protocol : 'ws'; @@ -64,17 +61,11 @@ class Blockchain { this.provider = new Provider(providerOptions); self.events.request("processes:launch", "blockchain", () => { - console.dir("======> blockchain launched!"); - console.dir("starting web3 provider"); self.provider.startWeb3Provider(() => { - console.dir("funding accounts"); self.provider.fundAccounts(() => { - console.dir("registering web3 object"); self.isWeb3Ready = true; self.events.emit(WEB3_READY); self.registerWeb3Object(); - - //self.events.emit("check:backOnline:Ethereum"); }); }); }); @@ -97,14 +88,11 @@ class Blockchain { } onReady(callback) { - console.dir("======> onReady!!"); - console.dir("this.isWeb3Ready: " + this.isWeb3Ready.toString()); if (this.isWeb3Ready) { return callback(); } this.events.once(WEB3_READY, () => { - console.dir("got event triggered"); callback(); }); } @@ -146,7 +134,6 @@ class Blockchain { if (err && err !== NO_NODE) { return cb(err); } - console.dir(statusObj); cb(statusObj); }); }, 5000, 'off'); @@ -198,10 +185,8 @@ class Blockchain { } getGasPrice(cb) { - console.dir("geting gas price"); const self = this; this.onReady(() => { - console.dir("it's ready, getting gas price"); self.web3.eth.getGasPrice(cb); }); } diff --git a/lib/contracts/deploy_manager.js b/lib/contracts/deploy_manager.js index bcd01cfc..46c7a22b 100644 --- a/lib/contracts/deploy_manager.js +++ b/lib/contracts/deploy_manager.js @@ -85,15 +85,15 @@ class DeployManager { return callback(); }, - // TODO: could be implemented as an event (beforeDeployAll) - function checkIsConnectedToBlockchain(callback) { - callback(); - //self.blockchain.onReady(() => { - // self.blockchain.assertNodeConnection((err) => { - // callback(err); - // }); - //}); - }, + //// TODO: could be implemented as an event (beforeDeployAll) + //function checkIsConnectedToBlockchain(callback) { + // callback(); + // //self.blockchain.onReady(() => { + // // self.blockchain.assertNodeConnection((err) => { + // // callback(err); + // // }); + // //}); + //}, // TODO: this can be done on the fly or as part of the initialization function determineDefaultAccount(callback) { diff --git a/lib/core/events.js b/lib/core/events.js index cd2218fd..88ddc9f6 100644 --- a/lib/core/events.js +++ b/lib/core/events.js @@ -11,6 +11,7 @@ function log(eventType, eventName) { if (['end', 'prefinish', 'error', 'new', 'demo', 'block', 'version'].indexOf(eventName) >= 0) { return; } + // prevents infinite loop when printing events if (eventType.indexOf("log") >= 0) { return; } diff --git a/lib/modules/blockchain_process/index.js b/lib/modules/blockchain_process/index.js index 043e0c1c..96c32a94 100644 --- a/lib/modules/blockchain_process/index.js +++ b/lib/modules/blockchain_process/index.js @@ -22,14 +22,7 @@ class BlockchainModule { this.events.request('processes:register', 'blockchain', (cb) => { console.dir("gonna check node connection"); self.assertNodeConnection(true, (connected) => { - if (connected === undefined) { - console.dir("result is undefined"); - } else { - console.dir("result is " + connected.toString()); - } - //if (!err) return cb(); if (connected) return cb(); - console.dir("blockchain not started, so gonna start one"); self.startBlockchainNode(cb); }); }); @@ -43,12 +36,8 @@ class BlockchainModule { const self = this; async.waterfall([ - // check if web3 is set - // function checkWeb3State(next) { self.events.request("blockchain:web3:isReady", (connected) => { - console.dir("---> checking web3 state"); - console.dir(connected.toString()); if (connected) { return next(connected); } @@ -71,7 +60,6 @@ class BlockchainModule { } startBlockchainNode(callback) { - console.dir("||==> startBlockchainNode"); const self = this; let blockchainProcess = new BlockchainProcessLauncher({ events: self.events, @@ -84,11 +72,9 @@ class BlockchainModule { blockchainProcess.startBlockchainNode(); self.events.once(constants.blockchain.blockchainReady, () => { - console.dir("||==> blockchainReady"); callback(); }); self.events.once(constants.blockchain.blockchainExit, () => { - console.dir("||==> blockchainExit"); self.provider.stop(); callback(); }); diff --git a/lib/modules/graph/index.js b/lib/modules/graph/index.js index e99272d2..4055fbfd 100644 --- a/lib/modules/graph/index.js +++ b/lib/modules/graph/index.js @@ -1,6 +1,7 @@ const Viz = require('viz.js'); const fs = require('fs'); +// TODO: refactor this class to use the plugin api and not refeneences directly class GraphGenerator { constructor(embark, options) { const self = this; diff --git a/test/contracts.js b/test/contracts.js index cd999376..54d1c7d4 100644 --- a/test/contracts.js +++ b/test/contracts.js @@ -39,9 +39,6 @@ describe('embark.Contracts', function() { let events = new Events(); let compiler = new Compiler({events: events, logger: plugins.logger}, {plugins: plugins}); - //events.setCommandHandler("compiler:contracts", function(contractFiles, cb) { - // compiler.compile_contracts(contractFiles, cb); - //}); events.setCommandHandler("config:contractsConfig", function(cb) { cb(contractsConfig);