From 26d591ea43dfc8a9799ab80bbc0e7bdbdd51f724 Mon Sep 17 00:00:00 2001 From: Nullart2 Date: Sun, 5 Aug 2018 21:08:07 +0800 Subject: [PATCH] mypy fix --- freqtrade/exchange/__init__.py | 2 +- freqtrade/exchange/exchange_helpers.py | 7 ++++--- freqtrade/freqtradebot.py | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/freqtrade/exchange/__init__.py b/freqtrade/exchange/__init__.py index 18b95b604..d5be25ba0 100644 --- a/freqtrade/exchange/__init__.py +++ b/freqtrade/exchange/__init__.py @@ -116,7 +116,7 @@ class Exchange(object): api.urls['api'] = api.urls['test'] logger.info("Enabled Sandbox API on %s", name) else: - logger.warning(self, "No Sandbox URL in CCXT, exiting. " + logger.warning(name, "No Sandbox URL in CCXT, exiting. " "Please check your config.json") raise OperationalException(f'Exchange {name} does not provide a sandbox api') diff --git a/freqtrade/exchange/exchange_helpers.py b/freqtrade/exchange/exchange_helpers.py index 6574f5a53..ac729190a 100644 --- a/freqtrade/exchange/exchange_helpers.py +++ b/freqtrade/exchange/exchange_helpers.py @@ -34,7 +34,7 @@ def parse_ticker_dataframe(ticker: list) -> DataFrame: return frame -def order_book_to_dataframe(data: list) -> DataFrame: +def order_book_to_dataframe(bids: list, asks: list) -> DataFrame: """ Gets order book list, returns dataframe with below format per suggested by creslin ------------------------------------------------------------------- @@ -42,11 +42,12 @@ def order_book_to_dataframe(data: list) -> DataFrame: ------------------------------------------------------------------- """ cols = ['bids', 'b_size'] - bids_frame = DataFrame(data['bids'], columns=cols) + + bids_frame = DataFrame(bids, columns=cols) # add cumulative sum column bids_frame['b_sum'] = bids_frame['b_size'].cumsum() cols2 = ['asks', 'a_size'] - asks_frame = DataFrame(data['asks'], columns=cols2) + asks_frame = DataFrame(asks, columns=cols2) # add cumulative sum column asks_frame['a_sum'] = asks_frame['a_size'].cumsum() diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py index 0c4670971..b91cb1bd2 100644 --- a/freqtrade/freqtradebot.py +++ b/freqtrade/freqtradebot.py @@ -386,7 +386,7 @@ class FreqtradeBot(object): conf_bids_to_ask_delta = experimental_check_depth_of_market.get('bids_to_ask_delta', 0) logger.info('checking depth of market for %s', pair) order_book = self.exchange.get_order_book(pair, 1000) - order_book_data_frame = order_book_to_dataframe(order_book) + order_book_data_frame = order_book_to_dataframe(order_book['bids'], order_book['asks']) order_book_bids = order_book_data_frame['b_size'].sum() order_book_asks = order_book_data_frame['a_size'].sum() bids_ask_delta = order_book_bids / order_book_asks