cleanup

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);
     });
 
@@ -54,7 +52,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';
@@ -73,17 +70,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");
         });
       });
     });
@@ -106,14 +97,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();
     });
   }
@@ -155,7 +143,6 @@ class Blockchain {
         if (err && err !== NO_NODE) {
           return cb(err);
         }
-        console.dir(statusObj);
         cb(statusObj);
       });
     }, 5000, 'off');
@@ -207,10 +194,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);
     });
   }

lib/contracts/deploy_manager.js

@@ -87,14 +87,9 @@ class DeployManager {
 
       // TODO: could be implemented as an event (beforeDeployAll)
       function checkIsConnectedToBlockchain(callback) {
-        self.blockchain.onReady(() => {
-          self.blockchain.assertNodeConnection(callback);
+        self.blockchain.onReady((err) => {
+          callback(err);
         });
-        //self.blockchain.onReady(() => {
-        //  self.blockchain.assertNodeConnection((err) => {
-        //    callback(err);
-        //  });
-        //});
       },
 
       // TODO: this can be done on the fly or as part of the initialization

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;
   }

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();
     });

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;

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);