embarklabs/embark
2
0
Fork 0
mirror of https://github.com/embarklabs/embark.git synced 2025-02-23 10:58:28 +00:00
Code Issues Projects Releases Wiki Activity

bugfix(@embark): fix upload and graph command (#1993)

Browse Source 
bugfix(@embark): fix upload command

bugfix(@embark): fix graph command

update graph cmd

update upload cmd
This commit is contained in:
Iuri Matias 2019-11-05 10:34:33 -05:00 committed by GitHub
parent b0e71d9427
commit 830e91de7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
packages/embark/src/cmd/cmd_controller.js
View File

@ -458,27 +458,32 @@ class EmbarkController {
context: this.context context: this.context
}); });
async.waterfall([ async.waterfall([
function (callback) { function (callback) {
engine.init({}, callback); engine.init({}, callback);
}, },
function (callback) {
engine.startService("libraryManager").installAll((err) => callback(err ? err : null));
},
function (callback) { function (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(", "));
} }
engine.startService("processManager"); engine.registerModuleGroup("coreComponents");
engine.startService("serviceMonitor"); engine.registerModuleGroup("stackComponents");
engine.startService("compiler");
engine.startService("codeGenerator");
engine.startService("graph");
engine.events.request('contracts:build', {}, callback); engine.registerModuleGroup("compiler");
engine.registerModuleGroup("contracts");
engine.registerModulePackage("embark-graph");
engine.startEngine(async () => {
let contractsFiles = await engine.events.request2("config:contractsFiles");
let compiledContracts = await engine.events.request2("compiler:contracts:compile", contractsFiles);
let _contractsConfig = await engine.events.request2("config:contractsConfig");
let contractsConfig = cloneDeep(_contractsConfig);
await engine.events.request2("contracts:build", contractsConfig, compiledContracts);
callback();
});
} }
], (err) => { ], (err) => {
if (err) { if (err) {
@ -647,18 +652,16 @@ class EmbarkController {
callback(); callback();
}); });
}, },
function (callback) {
engine.startService("libraryManager").installAll((err) => callback(err ? err : null));
},
function startServices(callback) { function startServices(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(", "));
} }
engine.registerModuleGroup("coreComponents"); engine.registerModuleGroup("coreComponents");
engine.registerModuleGroup("stackComponents"); engine.registerModuleGroup("stackComponents");
engine.registerModuleGroup("namesystem");
engine.registerModuleGroup("communication");
engine.registerModuleGroup("blockchain"); engine.registerModuleGroup("blockchain");
engine.registerModuleGroup("compiler"); engine.registerModuleGroup("compiler");
engine.registerModuleGroup("contracts"); engine.registerModuleGroup("contracts");
@ -668,29 +671,23 @@ class EmbarkController {
engine.registerModuleGroup("storage"); engine.registerModuleGroup("storage");
engine.registerModulePackage('embark-deploy-tracker', {plugins: engine.plugins}); engine.registerModulePackage('embark-deploy-tracker', {plugins: engine.plugins});
let plugin = engine.plugins.createPlugin('cmdcontrollerplugin', {}); const plugin = engine.plugins.createPlugin('cmdcontrollerplugin', {});
plugin.registerActionForEvent("embark:engine:started", async (_params, cb) => { plugin.registerActionForEvent("embark:engine:started", async (_params, cb) => {
await engine.events.request2("blockchain:node:start", engine.config.blockchainConfig, cb); try {
}); await engine.events.request2("blockchain:node:start", engine.config.blockchainConfig);
plugin.registerActionForEvent("embark:engine:started", async (_params, cb) => { await Promise.all([
await engine.events.request2("storage:node:start", engine.config.storageConfig, cb); engine.events.request2("storage:node:start", engine.config.storageConfig),
engine.events.request2("communication:node:start", engine.config.communicationConfig),
engine.events.request2("namesystem:node:start", engine.config.namesystemConfig)
]);
} catch (e) {
return cb(e);
}
cb();
}); });
engine.startEngine(async () => { engine.startEngine(async () => {
await compileAndDeploySmartContracts(engine);
let contractsFiles = await engine.events.request2("config:contractsFiles");
let compiledContracts = await engine.events.request2("compiler:contracts:compile", contractsFiles);
let _contractsConfig = await engine.events.request2("config:contractsConfig");
let contractsConfig = cloneDeep(_contractsConfig);
let [contractsList, contractDependencies] = await engine.events.request2("contracts:build", contractsConfig, compiledContracts);
try {
await engine.events.request2("deployment:contracts:deploy", contractsList, contractDependencies);
}
catch (err) {
engine.logger.error(err);
}
await engine.events.request2('pipeline:generateAll');
let storageConfig = await engine.events.request2("config:storageConfig"); let storageConfig = await engine.events.request2("config:storageConfig");
await engine.events.request2("storage:upload", storageConfig.upload.provider); await engine.events.request2("storage:upload", storageConfig.upload.provider);