mirror of https://github.com/embarklabs/embark.git
cleanup
This commit is contained in:
parent
14ac24d657
commit
91cc554978
|
@ -20,8 +20,6 @@ class Blockchain {
|
||||||
this.web3StartedInProcess = false;
|
this.web3StartedInProcess = false;
|
||||||
|
|
||||||
self.events.setCommandHandler("blockchain:web3:isReady", (cb) => {
|
self.events.setCommandHandler("blockchain:web3:isReady", (cb) => {
|
||||||
console.dir("geting state of web3");
|
|
||||||
console.dir(self.isWeb3Ready.toString());
|
|
||||||
cb(self.isWeb3Ready);
|
cb(self.isWeb3Ready);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -44,7 +42,6 @@ class Blockchain {
|
||||||
if (this.contractsConfig.deployment.type !== "rpc" && this.contractsConfig.deployment.type !== "ws") {
|
if (this.contractsConfig.deployment.type !== "rpc" && this.contractsConfig.deployment.type !== "ws") {
|
||||||
const message = __("contracts config error: unknown deployment type %s", this.contractsConfig.deployment.type);
|
const message = __("contracts config error: unknown deployment type %s", this.contractsConfig.deployment.type);
|
||||||
this.logger.error(message);
|
this.logger.error(message);
|
||||||
//return cb(message);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const protocol = (this.contractsConfig.deployment.type === "rpc") ? this.contractsConfig.deployment.protocol : 'ws';
|
const protocol = (this.contractsConfig.deployment.type === "rpc") ? this.contractsConfig.deployment.protocol : 'ws';
|
||||||
|
@ -63,17 +60,11 @@ class Blockchain {
|
||||||
this.provider = new Provider(providerOptions);
|
this.provider = new Provider(providerOptions);
|
||||||
|
|
||||||
self.events.request("processes:launch", "blockchain", () => {
|
self.events.request("processes:launch", "blockchain", () => {
|
||||||
console.dir("======> blockchain launched!");
|
|
||||||
console.dir("starting web3 provider");
|
|
||||||
self.provider.startWeb3Provider(() => {
|
self.provider.startWeb3Provider(() => {
|
||||||
console.dir("funding accounts");
|
|
||||||
self.provider.fundAccounts(() => {
|
self.provider.fundAccounts(() => {
|
||||||
console.dir("registering web3 object");
|
|
||||||
self.isWeb3Ready = true;
|
self.isWeb3Ready = true;
|
||||||
self.events.emit(WEB3_READY);
|
self.events.emit(WEB3_READY);
|
||||||
self.registerWeb3Object();
|
self.registerWeb3Object();
|
||||||
|
|
||||||
//self.events.emit("check:backOnline:Ethereum");
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -96,14 +87,11 @@ class Blockchain {
|
||||||
}
|
}
|
||||||
|
|
||||||
onReady(callback) {
|
onReady(callback) {
|
||||||
console.dir("======> onReady!!");
|
|
||||||
console.dir("this.isWeb3Ready: " + this.isWeb3Ready.toString());
|
|
||||||
if (this.isWeb3Ready) {
|
if (this.isWeb3Ready) {
|
||||||
return callback();
|
return callback();
|
||||||
}
|
}
|
||||||
|
|
||||||
this.events.once(WEB3_READY, () => {
|
this.events.once(WEB3_READY, () => {
|
||||||
console.dir("got event triggered");
|
|
||||||
callback();
|
callback();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -145,7 +133,6 @@ class Blockchain {
|
||||||
if (err && err !== NO_NODE) {
|
if (err && err !== NO_NODE) {
|
||||||
return cb(err);
|
return cb(err);
|
||||||
}
|
}
|
||||||
console.dir(statusObj);
|
|
||||||
cb(statusObj);
|
cb(statusObj);
|
||||||
});
|
});
|
||||||
}, 5000, 'off');
|
}, 5000, 'off');
|
||||||
|
@ -197,10 +184,8 @@ class Blockchain {
|
||||||
}
|
}
|
||||||
|
|
||||||
getGasPrice(cb) {
|
getGasPrice(cb) {
|
||||||
console.dir("geting gas price");
|
|
||||||
const self = this;
|
const self = this;
|
||||||
this.onReady(() => {
|
this.onReady(() => {
|
||||||
console.dir("it's ready, getting gas price");
|
|
||||||
self.web3.eth.getGasPrice(cb);
|
self.web3.eth.getGasPrice(cb);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,6 +11,7 @@ function log(eventType, eventName) {
|
||||||
if (['end', 'prefinish', 'error', 'new', 'demo', 'block', 'version'].indexOf(eventName) >= 0) {
|
if (['end', 'prefinish', 'error', 'new', 'demo', 'block', 'version'].indexOf(eventName) >= 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
// prevents infinite loop when printing events
|
||||||
if (eventType.indexOf("log") >= 0) {
|
if (eventType.indexOf("log") >= 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -86,15 +86,15 @@ class DeployManager {
|
||||||
return callback();
|
return callback();
|
||||||
},
|
},
|
||||||
|
|
||||||
// TODO: could be implemented as an event (beforeDeployAll)
|
//// TODO: could be implemented as an event (beforeDeployAll)
|
||||||
function checkIsConnectedToBlockchain(callback) {
|
//function checkIsConnectedToBlockchain(callback) {
|
||||||
callback();
|
// callback();
|
||||||
//self.blockchain.onReady(() => {
|
// //self.blockchain.onReady(() => {
|
||||||
// self.blockchain.assertNodeConnection((err) => {
|
// // self.blockchain.assertNodeConnection((err) => {
|
||||||
// callback(err);
|
// // callback(err);
|
||||||
// });
|
// // });
|
||||||
//});
|
// //});
|
||||||
},
|
//},
|
||||||
|
|
||||||
// TODO: this can be done on the fly or as part of the initialization
|
// TODO: this can be done on the fly or as part of the initialization
|
||||||
function determineDefaultAccount(callback) {
|
function determineDefaultAccount(callback) {
|
||||||
|
|
|
@ -2,6 +2,7 @@ const async = require('async');
|
||||||
const Viz = require('viz.js');
|
const Viz = require('viz.js');
|
||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
|
|
||||||
|
// TODO: refactor this class to use the plugin api and not refeneences directly
|
||||||
class GraphGenerator {
|
class GraphGenerator {
|
||||||
constructor(embark, _options) {
|
constructor(embark, _options) {
|
||||||
const self = this;
|
const self = this;
|
||||||
|
|
Loading…
Reference in New Issue