start web3 service so getGasPrice is available

This commit is contained in:
Jonathan Rainville 2018-06-19 10:03:46 -04:00
parent b363873da2
commit 01277f6014
1 changed files with 20 additions and 23 deletions

View File

@ -16,7 +16,7 @@ let version = require('../package.json').version;
class Embark { class Embark {
constructor (options) { constructor(options) {
this.version = version; this.version = version;
this.options = options || {}; this.options = options || {};
} }
@ -129,7 +129,7 @@ class Embark {
engine.events.on('check:backOnline:Ethereum', function () { engine.events.on('check:backOnline:Ethereum', function () {
engine.logger.info(__('Ethereum node detected') + '..'); engine.logger.info(__('Ethereum node detected') + '..');
engine.config.reloadConfig(); engine.config.reloadConfig();
engine.events.request('deploy:contracts', function(err) { engine.events.request('deploy:contracts', function (err) {
if (err) { if (err) {
return; return;
} }
@ -201,7 +201,7 @@ class Embark {
callback(); callback();
}, },
function deploy(callback) { function deploy(callback) {
engine.events.request('deploy:contracts', function(err) { engine.events.request('deploy:contracts', function (err) {
callback(err); callback(err);
}); });
}, },
@ -239,8 +239,7 @@ class Embark {
}); });
engine.init(); engine.init();
async.parallel([ async.waterfall([
function (callback) { function (callback) {
let pluginList = engine.plugins.listPlugins(); let pluginList = engine.plugins.listPlugins();
if (pluginList.length > 0) { if (pluginList.length > 0) {
@ -251,14 +250,12 @@ class Embark {
engine.startService("libraryManager"); engine.startService("libraryManager");
engine.startService("pipeline"); engine.startService("pipeline");
engine.startService("deployment", {onlyCompile: true}); engine.startService("deployment", {onlyCompile: true});
engine.startService("web3");
engine.startService("codeGenerator"); engine.startService("codeGenerator");
engine.events.request('deploy:contracts', function(err) { engine.events.request('deploy:contracts', callback);
callback(err);
});
} }
], (err, _result) => { ], (err) => {
if (err) { if (err) {
engine.logger.error(err.message); engine.logger.error(err.message);
engine.logger.info(err.stack); engine.logger.info(err.stack);
@ -320,7 +317,7 @@ class Embark {
engine.startService("codeGenerator"); engine.startService("codeGenerator");
callback(); callback();
}, },
function setupStoragePlugin(callback){ function setupStoragePlugin(callback) {
let pluginList = engine.plugins.listPlugins(); let pluginList = engine.plugins.listPlugins();
if (pluginList.length > 0) { if (pluginList.length > 0) {
engine.logger.info(__("loaded plugins") + ": " + pluginList.join(", ")); engine.logger.info(__("loaded plugins") + ": " + pluginList.join(", "));
@ -350,9 +347,9 @@ class Embark {
.catch(callback); .catch(callback);
}); });
engine.events.request('deploy:contracts', function(err) { engine.events.request('deploy:contracts', function (err) {
engine.logger.info(__("finished deploying").underline); engine.logger.info(__("finished deploying").underline);
if(err){ if (err) {
callback(err); callback(err);
} }
}); });