From 1af473ee9c42550a57e3427e0f36d1a67d229a85 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Wed, 7 Mar 2018 17:27:36 +0100
Subject: [PATCH] Read Config re implemented

---
 .vs/AACloudPlatform/v15/.suo | Bin 73216 -> 65536 bytes
 Azure File Storage.js        |  14 +++++++-------
 ExchangeAPI.js               |   2 +-
 Run.js                       |   4 ++++
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.vs/AACloudPlatform/v15/.suo b/.vs/AACloudPlatform/v15/.suo
index 56a728b49eec9c0d387e6e675b8f4437efebaf9e..d717665d27d699d338e6c9c7acb69962e736b75f 100644
GIT binary patch
delta 975
zcmZXSUr5tY6vub2zq#LZ+BW~DD>q%H6gq82is8(Ge+X=_qKE9SP#BtuNe|W(qKA~I
z9ps1MKW-R-hPn&UpuhOygJ}`iONmL)LqQ1k&_k|sWh0}*@5A}td(XM&aDS)wnbO;<
z+;usaE^20-E`?+qu^EX(<gV1Yv%YMmH!t+J6^jlw4FL;n<`70Ao}kz*%Oky$@DT~b
z9wK&@Oge4b+7{J&$vX*mbZsY}Psj$OSxKi84q^v!UZ)dd%3}ZnI#`Zz=1QQ|_2fO2
z;#Ib!%7h{c!tr@Kx|j*C8J<D`mZ%v}jP+_xU^gAgiZZaAybP8)X1__uim|oyb+q0`
z)JFGR<YV1slHO0GM$ZnAKN!_Ach@#uNqv1)ODu)7mrc|Y4a6l;Xv{JgA&Ip7718EZ
z>@qisIV*rF-&@&sA~q~07IHEsn0*s?DhoR271KWfS;t`OHRQAZz0lT(HI62<J61!x
zWp+Ac=dzI7&V)UG)xbS0=-z;%;-@<if~9j}&T|-e1*0!?NXBHY0<UB|lkt-Z_p(|4
z6x?g~2hBENtNUW)MU49uenjD?7;lK@&5WO5q(d!(iWqFZ47^?8EsS?7*yqm>89n_;
zNlVn9d_3vv(Kj$HPT%H9e1Y*>EVvlPUnAq_8+jzci?yJ+R8Vkev{Sob1UEJ<bz<vq
znHU<iDq?cwIH2W&4}W~KplvJ<vzK4t+2<zVo0zr+*CwUb>#2wi`#yDV<(&x+DWMl(
zv%DX}i(~liPCm}O^rFX?D+b<n#l?He%d4+X;QDfh7BN8Cf29qh;H_{~xHO9jc_Mpx
z1<-oG1zl_L_~t<YHFgp3^JJA)#h@ll4tdO~Nyu^X%Gz309K1%)gx(@&JZ5sLDn;_g
nHqdSwpog!phbl0>mVoQSPAy=BM6EahE@<ae$P!cE{V9I{^QK$_

delta 1278
zcmb7@U1(ET5XbMF-Zb~7X-#a5U7Oa});6*sy>aVGLtU#){pi+@LKT!EyMEwO!Otjy
ziq+NCt@Q(k`cRG4lOR5<s5v63Xj>6vVINu%R92De$79uf$iwc#HajOxAq(!q4*W9z
znR{|(&Tvjwm)dn-J!hcNsh2nuMOPFhj~Gv<)8rH&j@)i5WtLmB4r~pGUF;?t{(_SE
zgomgiXl=$SNjr%)!cEL3CchPt_U6P>vbu(R0a2HYr;)EFWCPNslAcM-B5cG)MG^h#
z4Zv3B)z7{5Z3^6d3SZ$~wi271K}@mLnk*F{@XD`VG?*RtTa)l52DRy6;Bsx|;R^aF
z>&pEb$p4VlGL}|Lv8+20P5dsW_-~TSvUxxGxmhiHEg>z7%GECNUuU(9>vMD&_4QKI
z@sARJ;T+1B5-mizn4{0IX3h|CtkOXaUd}Rm2n|z?5k0eeVNO=0oOYJ*c~#*JnQ-3q
z$fC#r;*+y}k#emD%|a2&`2$AWBRa^YtT|Z`DLcaibB_bBU<nr^T|I8)jqJSfCv@Xq
zRV}&_r1f%WlMRVTa1~g<kSQt`O9hxnRrx`9>tcY9SWu+q`x!+h@CL>&FdkrhvC2b?
zFS7|)k_Jfgc9l1(yo2#D<1H%R%=k*i*Rn)suPS;wwgKOnN$yj5r<yp(3y@#kz)u$O
zW6ah~H>{Y7+Y}s5?#AtAA=*tJ!lk%qjjjN=fe(|ruq?I!*Im4h1ASMpHM$!=J#Y$7
z|Jl5M{bzmbnzlXAxhL2Z>cBV2Hn|Et{gvW){6H~2eC`v*+fm^6R7z@z!2ySWOG^Qt
z^i<=mp)fYKRfwL^NS>v>e$k<LrtDz!r7UZ`4B?OwGB6k|#pCf|@$OkU;P7)RI{UVv
zk<7<+Piyeo=$>rF_XuN^SRQlX!rz<R^4d&T&2TFTdG*5AGW&b(6yd<_rTAT+2R(N-
z<EU9PO}?l}ldnZuSk40nUp=;Lp~#8%lly2=I_C_%Q9st1BbGIC9sdCQtqs4Y?S`TS
zSUa`}-^AUx!?cTE#@dU~X;$X;|IPpJuVUU&sv}>}kK~UL^40uA{seK7_?hS?P7yuC
yX=0o%%5N}30lLHgc|I}tYB6MbwVNp#?}ysV0kq}@bTrp}hCt%u3n%6``~Cqc7R_S-

diff --git a/Azure File Storage.js b/Azure File Storage.js
index fd6b436ea..cab5ac8be 100644
--- a/Azure File Storage.js	
+++ b/Azure File Storage.js	
@@ -8,7 +8,6 @@ exports.newAzureFileStorage = function newAzureFileStorage(BOT) {
 
     const MODULE_NAME = "Azure File Storage";
 
-    var fs = require('fs');
     var util = require('util');
     var guid = require('node-uuid');
     var crypto = require('crypto');
@@ -59,15 +58,16 @@ exports.newAzureFileStorage = function newAzureFileStorage(BOT) {
     function readConfig() {
 
         try {
-
-            return JSON.parse(fs.readFileSync(ROOT_DIR + dataOwner + '.azure.storage.connstring', 'utf8'));
-
+            let fs = require('fs');
+            let filePath = '../' + 'Connection-Strings' + '/' + global.RUNNING_MODE + '/' +  dataOwner + '.azure.storage.connstring' + '.json';
+            return JSON.parse(fs.readFileSync(filePath, 'utf8'));
         }
         catch (err) {
-            const logText = "[ERROR] 'readConfig' - ERROR : " + err.message;
-            logger.write(logText);
+            logger.write("[ERROR] readConfig -> err = " + err.message);
+            logger.write("[HINT] You need to have a file at this path -> " + filePath);
+            logger.write("[HINT] The file must have the connection string to the Azure Storage Account. Request the file to an AA Team Member if you dont have it.");
+            callBackFunction(global.DEFAULT_FAIL_RESPONSE);
         }
-
     }
 
     function createFolder(folderPath, callBackFunction) {
diff --git a/ExchangeAPI.js b/ExchangeAPI.js
index 7497135cb..89ee69159 100644
--- a/ExchangeAPI.js
+++ b/ExchangeAPI.js
@@ -42,7 +42,7 @@
 
                 try {
                     let fs = require('fs');
-                    let filePath = '../' + 'API-Keys' + '/' + EXCHANGE_NAME + '.json';
+                    let filePath = '../' + 'API-Keys' + '/' + bot.codeName  + '.'  + EXCHANGE_NAME + '.json';
                     return JSON.parse(fs.readFileSync(filePath, 'utf8'));
                 }
                 catch (err) {
diff --git a/Run.js b/Run.js
index 5473b2272..dba394ec0 100644
--- a/Run.js
+++ b/Run.js
@@ -1,6 +1,10 @@
 
 const LOG_INFO = true;
 
+/* The following global variable tells the system if it is running on test mode or production. */
+
+global.RUNNING_MODE = 'Testnet';  // or 'Production'
+
 /* First thing to do is to read the config and guess which bot we will be running. */
 
 var fs = require('fs');