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

fix tests, enable blockchain component by default

Browse Source
This commit is contained in:
Iuri Matias 2018-04-02 14:44:55 -04:00
parent d3b0787895
commit 10f7d21f81
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/core/config.js
View File

@ -63,10 +63,10 @@ Config.prototype.reloadConfig = function() {
this.loadChainTrackerFile(); this.loadChainTrackerFile();
}; };
Config.prototype._mergeConfig = function(configFilePath, defaultConfig, env) { Config.prototype._mergeConfig = function(configFilePath, defaultConfig, env, enabledByDefault) {
if (!configFilePath) { if (!configFilePath) {
let configToReturn = defaultConfig['default'] || {}; let configToReturn = defaultConfig['default'] || {};
configToReturn.enabled = false; configToReturn.enabled = enabledByDefault || false;
return configToReturn; return configToReturn;
} }
@ -102,7 +102,9 @@ Config.prototype.loadBlockchainConfigFile = function() {
} }
}; };
this.blockchainConfig = this._mergeConfig("blockchain.json", configObject, this.env); let configFilePath = this._getFileOrOject(this.configDir, 'blockchain.json', 'blockchain');
this.blockchainConfig = this._mergeConfig(configFilePath, configObject, this.env, true);
}; };
Config.prototype.loadContractsConfigFile = function() { Config.prototype.loadContractsConfigFile = function() {

1
templates/simple/embark.json
View File

@ -4,6 +4,7 @@
"buildDir": "build/", "buildDir": "build/",
"config": { "config": {
"contracts": "contracts.json", "contracts": "contracts.json",
"blockchain": false,
"storage": false, "storage": false,
"communication": false, "communication": false,
"webserver": false "webserver": false