From 9f9fec1c3fe01231290f5fd39e6e482d44923e57 Mon Sep 17 00:00:00 2001 From: Matias Date: Sun, 17 Mar 2019 12:06:04 +0100 Subject: [PATCH 1/2] Duplicate variable --- Exchange/ExchangeAPI.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/Exchange/ExchangeAPI.js b/Exchange/ExchangeAPI.js index ae881079d..3fe812497 100644 --- a/Exchange/ExchangeAPI.js +++ b/Exchange/ExchangeAPI.js @@ -45,8 +45,6 @@ } function getOpenPositions (pMarket, callBackFunction) { - let authToken = window.localStorage.getItem('access_token') - let authToken = window.localStorage.getItem('access_token'); let path = SERVER_URL From d4b9b8755bd7fcc3c73383ce3c38b8fd6deaf011 Mon Sep 17 00:00:00 2001 From: Matias Date: Sun, 17 Mar 2019 12:32:24 +0100 Subject: [PATCH 2/2] Fixing merge issues --- Exchange/ExchangeAPI.js | 58 +++++++---------------------------------- 1 file changed, 10 insertions(+), 48 deletions(-) diff --git a/Exchange/ExchangeAPI.js b/Exchange/ExchangeAPI.js index 3fe812497..f72cfa729 100644 --- a/Exchange/ExchangeAPI.js +++ b/Exchange/ExchangeAPI.js @@ -50,6 +50,8 @@ let path = SERVER_URL + "getOpenPositions" + "/" + authToken + + callServer(undefined, path + '/NO-LOG', onServerResponse) function onServerResponse(pServerResponse) { let response = JSON.parse(pServerResponse); @@ -105,38 +107,7 @@ } } } - - function putPosition (pMarket, pType, pRate, pAmountA, pAmountB, callBackFunction) { - let authToken = window.localStorage.getItem('access_token') - - let path = SERVER_URL - + CURRENT_BOT_CODE_NAME + '/' - + 'putPosition' + '/' - + authToken + '/' - + pType + '/' - + pRate + '/' - + pAmountA + '/' - + pAmountB - - let path = SERVER_URL - + "movePosition" + "/" - + authToken + "/" - + pPositionId + "/" - + pNewRate + "/" - + pPositionAmountB - - callServer(undefined, path + '/NO-LOG', onServerResponse) - - function onServerResponse (pServerResponse) { - let response = JSON.parse(pServerResponse) - if (response.result === window.DEFAULT_FAIL_RESPONSE.result) { - callBackFunction(window.DEFAULT_FAIL_RESPONSE) - } else { - callBackFunction(window.DEFAULT_OK_RESPONSE, response) - } - } - } - + function getPublicTradeHistory (pMarket, startTime, endTime, callBackFunction) { let authToken = window.localStorage.getItem('access_token') @@ -149,21 +120,12 @@ callServer(undefined, path + '/NO-LOG', onServerResponse) - let path = SERVER_URL - + "getPublicTradeHistory" + "/" - + authToken + "/" - + startTime + "/" - + endTime - ; - - callServer(undefined, path + "/NO-LOG", onServerResponse); - - function onServerResponse(pServerResponse) { - let response = JSON.parse(pServerResponse); - if (response.result === window.DEFAULT_FAIL_RESPONSE.result) - callBackFunction(window.DEFAULT_FAIL_RESPONSE); - else - callBackFunction(window.DEFAULT_OK_RESPONSE, response); - } + function onServerResponse(pServerResponse) { + let response = JSON.parse(pServerResponse); + if (response.result === window.DEFAULT_FAIL_RESPONSE.result) + callBackFunction(window.DEFAULT_FAIL_RESPONSE); + else + callBackFunction(window.DEFAULT_OK_RESPONSE, response); + } } }