From 8ace5653cd5e92bb4cec1647694ccfbf5e303221 Mon Sep 17 00:00:00 2001
From: VoR0220 <catalanor0220@gmail.com>
Date: Fri, 25 May 2018 12:52:57 -0500
Subject: [PATCH] fix some linting issues and add a few forgotten lines to the
 config function

Signed-off-by: VoR0220 <catalanor0220@gmail.com>
---
 lib/core/config.js          | 8 ++++++--
 lib/modules/ens/embarkjs.js | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/core/config.js b/lib/core/config.js
index 86a51df3..1d20b786 100644
--- a/lib/core/config.js
+++ b/lib/core/config.js
@@ -214,8 +214,12 @@ Config.prototype.loadNameSystemConfigFile = function() {
       "available_providers": ["ens"],
       "provider": "ens"
     }
-  }
-}
+  };
+
+  let configFilePath = this._getFileOrOject(this.configDir, 'namesystem', 'namesystem');
+
+  this.namesystemConfig = this._mergeConfig(configFilePath, configObject, this.env);
+};
 
 Config.prototype.loadCommunicationConfigFile = function() {
   var configObject = {
diff --git a/lib/modules/ens/embarkjs.js b/lib/modules/ens/embarkjs.js
index 171fccc7..0c6b08be 100644
--- a/lib/modules/ens/embarkjs.js
+++ b/lib/modules/ens/embarkjs.js
@@ -252,9 +252,10 @@ __embarkENS.registryAddresses = {
 
 __embarkENS.setProvider = function () {
   // get network id and then assign ENS contract based on that 
+  let registryAddresses = this.registryAddresses;
   this.ens = web3.eth.net.getId().then(id => {
     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
     return undefined;