status-im/embark-area-51
2
0
Fork 0
mirror of https://github.com/status-im/embark-area-51.git synced 2025-01-11 14:34:40 +00:00
Code Issues Projects Releases Wiki Activity

remove unneded references to web3 objects; leave clarifying notes

Browse Source
This commit is contained in:
Iuri Matias 2018-05-18 21:05:39 -04:00 committed by Jonathan Rainville
parent ac45b7a19b
commit 68c277cad1
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/core/engine.js
View File

@ -268,7 +268,9 @@ class Engine {
this.registerModule('swarm', { this.registerModule('swarm', {
addCheck: this.servicesMonitor.addCheck.bind(this.servicesMonitor), addCheck: this.servicesMonitor.addCheck.bind(this.servicesMonitor),
storageConfig: this.config.storageConfig, storageConfig: this.config.storageConfig,
bzz: _options.bzz // TODO: this should not be needed and should be deducted from the config instead
// the eth provider is not necessary the same as the swarm one
bzz: this.blockchain.web3.bzz
}); });
} }
@ -286,7 +288,7 @@ class Engine {
communicationConfig: this.config.communicationConfig, communicationConfig: this.config.communicationConfig,
// TODO: this should not be needed and should be deducted from the config instead // TODO: this should not be needed and should be deducted from the config instead
// the eth provider is not necessary the same as the whisper one // the eth provider is not necessary the same as the whisper one
web3: this.web3 web3: this.blockchain.web3
}); });
} }

9
lib/index.js
View File

@ -132,7 +132,8 @@ class Embark {
engine.startService("pipeline"); engine.startService("pipeline");
engine.startService("codeGenerator"); engine.startService("codeGenerator");
engine.startService("deployment"); engine.startService("deployment");
engine.startService(engine.config.storageConfig.provider, {bzz: engine.web3.bzz}); // TODO: this should be just 'storage' and the storage should figure out the module
engine.startService(engine.config.storageConfig.provider);
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') + '..');
@ -205,8 +206,9 @@ class Embark {
engine.startService("pipeline"); engine.startService("pipeline");
engine.startService("codeGenerator"); engine.startService("codeGenerator");
engine.startService("deployment", {onlyCompile: options.onlyCompile}); engine.startService("deployment", {onlyCompile: options.onlyCompile});
// TODO: this should be just 'storage' and the storage should figure out the modules to load
engine.startService("ipfs"); engine.startService("ipfs");
engine.startService("swarm", {bzz: engine.web3.bzz}); engine.startService("swarm");
callback(); callback();
}, },
function deploy(callback) { function deploy(callback) {
@ -319,7 +321,8 @@ class Embark {
engine.startService("pipeline"); engine.startService("pipeline");
engine.startService("codeGenerator"); engine.startService("codeGenerator");
engine.startService("deployment"); engine.startService("deployment");
engine.startService(platform.toLowerCase(), {bzz: engine.web3.bzz}); // TODO: this should be just 'storage' and the storage should figure out the modules to load
engine.startService(platform.toLowerCase());
engine.startMonitor(); engine.startMonitor();
callback(); callback();
}, },