#31 refactor poloniex package

Author: kruglov-dmitry

binance/constants.py

@@ -1,5 +1,5 @@
 
-BINANCE_GET_TICKER = "https://api.binance.com/api/v1/ticker/allBookTickers"  #  Yeah, it just return EVERYTHING
+BINANCE_GET_TICKER = "https://api.binance.com/api/v1/ticker/allBookTickers"  # Yeah, it just return EVERYTHING
 
 # OHLC ~ canddle stick urls
 # https://api.binance.com/api/v1/klines?symbol=XMRETH&interval=15m&startTime=

binance/order_book_utils.py

@@ -11,7 +11,7 @@
 from enums.status import STATUS
 
 
-def get_order_book_binance_url(currency, timest):
+def get_order_book_binance_url(currency):
     # https://api.binance.com/api/v1/depth?symbol=XMRETH
     final_url = BINANCE_GET_ORDER_BOOK + currency
 
@@ -23,7 +23,7 @@ def get_order_book_binance_url(currency, timest):
 
 def get_order_book_binance(pair_name, timest):
 
-    final_url = get_order_book_binance_url(pair_name, timest)
+    final_url = get_order_book_binance_url(pair_name)
 
     err_msg = "get_order_book_binance called for {pair} at {timest}".format(pair=pair_name, timest=timest)
     error_code, r = send_request(final_url, err_msg)

binance/ticker_utils.py

@@ -11,7 +11,7 @@
 from enums.status import STATUS
 
 
-def get_tickers_binance_url(currency_names, timest):
+def get_tickers_binance_url(pair_name):
     final_url = BINANCE_GET_TICKER
 
     if should_print_debug():
@@ -20,33 +20,33 @@ def get_tickers_binance_url(currency_names, timest):
     return final_url
 
 
-def get_tickers_binance(currency_names, timest):
+def get_tickers_binance(pair_name, timest):
 
     """
    {"symbol":"ETHBTC","bidPrice":"0.04039700","bidQty":"4.50700000","askPrice":"0.04047500","askQty":"1.30600000"},
    {"symbol":"LTCBTC","bidPrice":"0.00875700","bidQty":"0.24000000","askPrice":"0.00876200","askQty":"0.01000000"},
 
-    :param currency_names:
+    :param pair_name:
     :param timest:
     :return:
     """
 
-    final_url = get_tickers_binance_url(currency_names, timest)
+    final_url = get_tickers_binance_url(pair_name)
 
     err_msg = "get_tickers_binance called for list of pairS at {timest}".format(timest=timest)
     error_code, r = send_request(final_url, err_msg)
 
     res = []
     if error_code == STATUS.SUCCESS and r is not None:
         for entry in r:
-            if entry["symbol"] in currency_names:
+            if entry["symbol"] in pair_name:
                 res.append(Ticker.from_binance(entry["symbol"], timest, entry))
 
     return res
 
 
 def get_ticker_binance(pair_name, timest):
-    final_url = get_tickers_binance_url(pair_name, timest)
+    final_url = get_tickers_binance_url(pair_name)
 
     err_msg = "get_ticker_binance called for {pair} at {timest}".format(pair=pair_name, timest=timest)
     error_code, json_document = send_request(final_url, err_msg)

bittrex/ohlc_utils.py

@@ -40,7 +40,8 @@ def get_ohlc_bittrex_result_processor(json_document, pair_name, date_start, date
 
     for record in json_document["result"]:
         new_candle = Candle.from_bittrex(record, pair_name)
-        if new_candle.timest >= date_start:  # NOTE: API V2 tend to ignore time parameter - so we have to filter it manually
+        # NOTE: API V2 tend to ignore time parameter - so we have to filter it manually
+        if new_candle.timest >= date_start:
             result_set.append(new_candle)
 
     return result_set

bittrex/order_book_utils.py

@@ -11,7 +11,7 @@
 from enums.status import STATUS
 
 
-def get_order_book_bittrex_url(pair_name, timest):
+def get_order_book_bittrex_url(pair_name):
     # https://bittrex.com/api/v1.1/public/getorderbook?type=both&market=BTC-LTC
     final_url = BITTREX_GET_ORDER_BOOK + pair_name
 
@@ -23,7 +23,7 @@ def get_order_book_bittrex_url(pair_name, timest):
 
 def get_order_book_bittrex(pair_name, timest):
 
-    final_url = get_order_book_bittrex_url(pair_name, timest)
+    final_url = get_order_book_bittrex_url(pair_name)
 
     err_msg = "get_order_book_bittrex called for {pair} at {timest}".format(pair=pair_name, timest=timest)
     error_code, r = send_request(final_url, err_msg)

bittrex/ticker_utils.py

@@ -12,7 +12,7 @@
 from enums.status import STATUS
 
 
-def get_ticker_bittrex_url(pair_name, timest):
+def get_ticker_bittrex_url(pair_name):
     # https://bittrex.com/api/v1.1/public/getticker?market=BTC-LTC
     final_url = BITTREX_GET_TICKER + pair_name
 
@@ -24,7 +24,7 @@ def get_ticker_bittrex_url(pair_name, timest):
 
 def get_ticker_bittrex(pair_name, timest):
 
-    final_url = get_ticker_bittrex_url(pair_name, timest)
+    final_url = get_ticker_bittrex_url(pair_name)
 
     err_msg = "get_ticker_bittrex called for {pair} at {timest}".format(pair=pair_name, timest=timest)
     error_code, json_document = send_request(final_url, err_msg)

dao/order_book_utils.py

@@ -58,7 +58,7 @@ def get_order_book_speedup(date_start, date_end, processor):
             pair_name = get_currency_pair_name_by_exchange_id(pair_id, exchange_id)
             if pair_name:
                 method_for_url = get_order_book_url_by_exchange_id(exchange_id)
-                request_url = method_for_url(pair_name, date_end)
+                request_url = method_for_url(pair_name)
                 constructor = get_order_book_constructor_by_exchange_id(exchange_id)
 
                 order_book_async_requests.append(WorkUnit(request_url, constructor, pair_name, date_end))
@@ -77,7 +77,7 @@ def get_order_books_for_arbitrage_pair(cfg, date_end, processor):
             assert pair_name is None
 
         method_for_url = get_order_book_url_by_exchange_id(exchange_id)
-        request_url = method_for_url(pair_name, date_end)
+        request_url = method_for_url(pair_name)
         constructor = get_order_book_constructor_by_exchange_id(exchange_id)
 
         order_book_async_requests.append(WorkUnit(request_url, constructor, pair_name, date_end))

dao/ticker_utils.py

@@ -27,10 +27,9 @@
 def get_ticker_constructor_by_exchange_id(exchange_id):
     """
         Return functor that expect following arguments:
-            json_array,
+            json_document - response of exchange,
             exchange specific name of currency
-            date_start
-            date_end
+            timest - current time
         It will return array of object from data/* folder
     """
     return {
@@ -54,7 +53,7 @@ def get_ticker_speedup(timest, processor):
                 continue
 
             method_for_url = get_ticker_url_by_exchange_id(exchange_id)
-            request_url = method_for_url(pair_name, timest)
+            request_url = method_for_url(pair_name)
             constructor = get_ticker_constructor_by_exchange_id(exchange_id)
 
             ohlc_async_requests.append(WorkUnit(request_url, constructor, pair_name, timest))
@@ -118,7 +117,7 @@ def get_ticker_for_arbitrage(pair_id, timest, exchange_list, processor):
             assert pair_name is None
 
         method_for_url = get_ticker_url_by_exchange_id(exchange_id)
-        request_url = method_for_url(pair_name, timest)
+        request_url = method_for_url(pair_name)
         constructor = get_ticker_constructor_by_exchange_id(exchange_id)
 
         async_requests.append(WorkUnit(request_url, constructor, pair_name, timest))

huobi/buy_utils.py

@@ -10,7 +10,7 @@
 
 from utils.file_utils import log_to_file
 from utils.string_utils import float_to_str
-from huobi.rest_api import generate_body_and_url_get_request, send_post_request_with
+from huobi.rest_api import generate_body_and_url_get_request, send_post_request_with_logging
 
 BUY_URL = HUOBI_API_URL + HUOBI_BUY_ORDER + "?"
 
@@ -45,4 +45,4 @@ def add_buy_order_huobi(key, pair_name, price, amount):
     err_msg = "add_buy_order_huobi  called for {pair} for amount = {amount} with price {price}".format(
         pair=pair_name, amount=amount, price=price)
 
-    return send_post_request_with(post_details, err_msg)
+    return send_post_request_with_logging(post_details, err_msg)

huobi/market_utils.py

@@ -10,7 +10,7 @@
 from huobi.constants import HUOBI_CANCEL_ORDER, HUOBI_API_URL, HUOBI_API_ONLY, \
     HUOBI_POST_HEADERS
 from huobi.error_handling import is_error
-from huobi.rest_api import init_body, send_post_request_with
+from huobi.rest_api import init_body, send_post_request_with_logging
 
 
 def cancel_order_huobi(key, order_id):
@@ -41,7 +41,7 @@ def cancel_order_huobi(key, order_id):
 
     err_msg = "cancel huobi order with id {id}".format(id=order_id)
 
-    return send_post_request_with(post_details, err_msg)
+    return send_post_request_with_logging(post_details, err_msg)
 
 
 def parse_order_id_huobi(json_document):

huobi/order_book_utils.py

@@ -11,8 +11,7 @@
 from enums.status import STATUS
 
 
-def get_order_book_huobi_url(pair_name, timest):
-    #
+def get_order_book_huobi_url(pair_name):
     final_url = HUOBI_GET_ORDER_BOOK + pair_name + "&type=step0"
 
     if should_print_debug():
@@ -23,7 +22,7 @@ def get_order_book_huobi_url(pair_name, timest):
 
 def get_order_book_huobi(pair_name, timest):
 
-    final_url = get_order_book_huobi_url(pair_name, timest)
+    final_url = get_order_book_huobi_url(pair_name)
 
     err_msg = "get_order_book_huobi called for {pair} at {timest}".format(pair=pair_name, timest=timest)
     error_code, json_document = send_request(final_url, err_msg)

huobi/rest_api.py

@@ -52,7 +52,7 @@ def generate_body_and_url_get_request(key, base_url, path):
     return body, _urlencode(body)
 
 
-def send_post_request_with(post_details, err_msg):
+def send_post_request_with_logging(post_details, err_msg):
     res = send_post_request_with_header(post_details, err_msg, max_tries=HUOBI_NUM_OF_DEAL_RETRY,
                                         timeout=HUOBI_DEAL_TIMEOUT)
 

huobi/sell_utils.py

@@ -2,7 +2,7 @@
 
 from huobi.constants import HUOBI_SELL_ORDER, HUOBI_API_URL, HUOBI_API_ONLY, HUOBI_POST_HEADERS
 from huobi.account_utils import get_huobi_account
-from huobi.rest_api import generate_body_and_url_get_request, send_post_request_with
+from huobi.rest_api import generate_body_and_url_get_request, send_post_request_with_logging
 
 from data_access.classes.post_request_details import PostRequestDetails
 from utils.string_utils import float_to_str
@@ -34,4 +34,4 @@ def add_sell_order_huobi(key, pair_name, price, amount):
     err_msg = "add_sell_order huobi called for {pair} for amount = {amount} with price {price}".format(
         pair=pair_name, amount=amount, price=price)
 
-    return send_post_request_with(post_details, err_msg)
+    return send_post_request_with_logging(post_details, err_msg)

huobi/ticker_utils.py

@@ -12,7 +12,7 @@
 from enums.status import STATUS
 
 
-def get_ticker_huobi_url(pair_name, timest):
+def get_ticker_huobi_url(pair_name):
     final_url = HUOBI_GET_TICKER + pair_name
 
     if should_print_debug():
@@ -23,7 +23,7 @@ def get_ticker_huobi_url(pair_name, timest):
 
 def get_ticker_huobi(pair_name, timest):
 
-    final_url = get_ticker_huobi_url(pair_name, timest)
+    final_url = get_ticker_huobi_url(pair_name)
 
     err_msg = "get_ticker_huobi called for {pair} at {timest}".format(pair=pair_name, timest=timest)
     error_code, json_document = send_request(final_url, err_msg)

kraken/order_book_utils.py

@@ -12,7 +12,7 @@
 from debug_utils import print_to_console, LOG_ALL_DEBUG, ERROR_LOG_FILE_NAME, should_print_debug
 
 
-def get_order_book_kraken_url(pair_name, timest):
+def get_order_book_kraken_url(pair_name):
     # https://api.kraken.com/0/public/Depth?pair=XETHXXBT
     final_url = KRAKEN_GET_ORDER_BOOK + pair_name
 
@@ -24,7 +24,7 @@ def get_order_book_kraken_url(pair_name, timest):
 
 def get_order_book_kraken(pair_name, timest):
 
-    final_url = get_order_book_kraken_url(pair_name, timest)
+    final_url = get_order_book_kraken_url(pair_name)
 
     err_msg = "get_order_book_kraken called for {pair} at {timest}".format(pair=pair_name, timest=timest)
     error_code, json_document = send_request(final_url, err_msg)

kraken/ticker_utils.py

@@ -11,7 +11,7 @@
 from utils.file_utils import log_to_file
 
 
-def get_ticker_kraken_url(pair_name, timest):
+def get_ticker_kraken_url(pair_name):
     # https://api.kraken.com/0/public/Ticker?pair=DASHXBT
     final_url = KRAKEN_GET_TICKER + pair_name
 
@@ -23,7 +23,7 @@ def get_ticker_kraken_url(pair_name, timest):
 
 def get_ticker_kraken(pair_name, timest):
 
-    final_url = get_ticker_kraken_url(pair_name, timest)
+    final_url = get_ticker_kraken_url(pair_name)
 
     err_msg = "get_ticker_kraken called for {pair} at {timest}".format(pair=pair_name, timest=timest)
     error_code, json_document = send_request(final_url, err_msg)

management/classes/ProcessDetails.py

@@ -1,5 +1,5 @@
 
-class ProcessDetails():
+class ProcessDetails(object):
     def __init__(self, cmd, pid):
         self.cmd = cmd
         self.pid = pid
@@ -10,4 +10,4 @@ def get_pair_id(self):
 
     def _parse_cmd(self, cmd):
         # FIXME NOTE parsing
-        return ""
+        return ""

management/classes/ServerDetails.py

@@ -1,6 +1,7 @@
-class ServerDetails():
+# FIXME NOTE: https://unix.stackexchange.com/questions/267478/getting-public-ip-address-of-ec2-instance-from-outside-using-aws-cli
+
+
+class ServerDetails(object):
     def __init__(self, server_name, server_id):
         self.server_name = server_name
-        self.server_id = server_id
-
-        # FIXME NOTE: https://unix.stackexchange.com/questions/267478/getting-public-ip-address-of-ec2-instance-from-outside-using-aws-cli
+        self.server_id = server_id

management/monitoring.py

@@ -8,7 +8,8 @@ def register_node(config):
 
     # enter data to the redis
 
+    """
 
-
-
-
+    :param config:
+    :return:
+    """

poloniex/buy_utils.py

@@ -1,24 +1,16 @@
-from poloniex.constants import POLONIEX_BUY_ORDER, POLONIEX_NUM_OF_DEAL_RETRY, POLONIEX_DEAL_TIMEOUT
+from poloniex.constants import POLONIEX_BUY_ORDER
+from poloniex.rest_api import generate_body, send_post_request_with_logging
 
 from data_access.classes.post_request_details import PostRequestDetails
-from data_access.internet import send_post_request_with_header
-from data_access.memory_cache import generate_nonce
 
 from debug_utils import print_to_console, LOG_ALL_MARKET_RELATED_CRAP, get_logging_level
 
 from utils.file_utils import log_to_file
 from utils.key_utils import signed_body
-from utils.string_utils import float_to_str
 
 
 def add_buy_order_poloniex_url(key, pair_name, price, amount):
-    body = {
-        "command": "buy",
-        "currencyPair": pair_name,
-        "rate": float_to_str(price),
-        "amount": float_to_str(amount),
-        "nonce": generate_nonce()
-    }
+    body = generate_body(pair_name, price, amount, "buy")
 
     headers = {"Key": key.api_key, "Sign": signed_body(body, key.secret)}
     # https://poloniex.com/tradingApi
@@ -38,13 +30,7 @@ def add_buy_order_poloniex(key, pair_name, price, amount):
 
     post_details = add_buy_order_poloniex_url(key, pair_name, price, amount)
 
-    err_msg = "add_buy_order poloniex called for {pair} for amount = {amount} with price {price}".format(pair=pair_name, amount=amount, price=price)
+    err_msg = "add_buy_order poloniex called for {pair} for amount = {amount} with price {price}".format(
+        pair=pair_name, amount=amount, price=price)
 
-    res = send_post_request_with_header(post_details, err_msg,
-                                        max_tries=POLONIEX_NUM_OF_DEAL_RETRY, timeout=POLONIEX_DEAL_TIMEOUT)
-
-    if get_logging_level() >= LOG_ALL_MARKET_RELATED_CRAP:
-        print_to_console(res, LOG_ALL_MARKET_RELATED_CRAP)
-        log_to_file(res, "market_utils.log")
-
-    return res
+    return send_post_request_with_logging(post_details, err_msg)