status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix some linting issues and add a few forgotten lines to the config function 

Signed-off-by: VoR0220 <catalanor0220@gmail.com>
This commit is contained in:
VoR0220 2018-05-25 12:52:57 -05:00
parent 9cb10c7ce7
commit 8ace5653cd
2 changed files with 8 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

@ -214,8 +214,12 @@ Config.prototype.loadNameSystemConfigFile = function() {
"available_providers": ["ens"], "available_providers": ["ens"],
"provider": "ens" "provider": "ens"
} }
} };
}
let configFilePath = this._getFileOrOject(this.configDir, 'namesystem', 'namesystem');
this.namesystemConfig = this._mergeConfig(configFilePath, configObject, this.env);
};
Config.prototype.loadCommunicationConfigFile = function() { Config.prototype.loadCommunicationConfigFile = function() {
var configObject = { var configObject = {

3
lib/modules/ens/embarkjs.js
View File

@ -252,9 +252,10 @@ __embarkENS.registryAddresses = {
__embarkENS.setProvider = function () { __embarkENS.setProvider = function () {
// get network id and then assign ENS contract based on that // get network id and then assign ENS contract based on that
let registryAddresses = this.registryAddresses;
this.ens = web3.eth.net.getId().then(id => { this.ens = web3.eth.net.getId().then(id => {
if (registryAddresses[id] !== undefined) { if (registryAddresses[id] !== undefined) {
return new web3.eth.Contract(this.registryInterface, this.registryAddresses[id]); return new web3.eth.Contract(this.registryInterface, registryAddresses[id]);
} }
// todo: deploy at this point // todo: deploy at this point
return undefined; return undefined;