adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flake8 compliance

Browse Source
This commit is contained in:
Nullart 2018-06-14 12:37:44 +08:00
parent dc03b41c68
commit 79dd0eb104
5 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freqtrade/exchange/__init__.py
View File

@ -239,6 +239,7 @@ def get_balances() -> dict:
except ccxt.BaseError as e: except ccxt.BaseError as e:
raise OperationalException(e) raise OperationalException(e)
@retrier @retrier
def get_order_book(pair: str, limit: Optional[int] = 1000) -> dict: def get_order_book(pair: str, limit: Optional[int] = 1000) -> dict:
try: try:
@ -253,6 +254,7 @@ def get_order_book(pair: str, limit: Optional[int] = 1000) -> dict:
except ccxt.BaseError as e: except ccxt.BaseError as e:
raise OperationalException(e) raise OperationalException(e)
@retrier @retrier
def get_tickers() -> Dict: def get_tickers() -> Dict:
try: try:

12
freqtrade/freqtradebot.py
View File

@ -247,7 +247,7 @@ class FreqtradeBot(object):
:return: float: Price :return: float: Price
""" """
ticker = exchange.get_ticker(pair); ticker = exchange.get_ticker(pair)
if ticker['ask'] < ticker['last']: if ticker['ask'] < ticker['last']:
return ticker['ask'] return ticker['ask']
balance = self.config['bid_strategy']['ask_last_balance'] balance = self.config['bid_strategy']['ask_last_balance']
@ -265,7 +265,6 @@ class FreqtradeBot(object):
logger.info('Using Ask / Last Price') logger.info('Using Ask / Last Price')
return ticker_rate return ticker_rate
def create_trade(self) -> bool: def create_trade(self) -> bool:
""" """
Checks the implemented trading indicator(s) for a randomly picked pair, Checks the implemented trading indicator(s) for a randomly picked pair,
@ -452,9 +451,12 @@ with limit `{buy_limit:.8f} ({stake_amount:.6f} \
logger.info('Using order book for selling...') logger.info('Using order book for selling...')
orderBook = exchange.get_order_book(trade.pair) orderBook = exchange.get_order_book(trade.pair)
# logger.debug('Order book %s',orderBook) # logger.debug('Order book %s',orderBook)
for i in range(self.config['ask_strategy']['book_order_min'],self.config['ask_strategy']['book_order_max']+1): orderBook_min = self.config['ask_strategy']['book_order_min']
orderBook_max = self.config['ask_strategy']['book_order_max']
for i in range(orderBook_min, orderBook_max+1):
orderBook_rate = orderBook['asks'][i-1][0] orderBook_rate = orderBook['asks'][i-1][0]
# if orderbook has higher rate (high profit), use orderbook, otherwise just use sell rate # if orderbook has higher rate (high profit),
# use orderbook, otherwise just use sell rate
if (sell_rate < orderBook_rate): if (sell_rate < orderBook_rate):
sell_rate = orderBook_rate sell_rate = orderBook_rate
if self.check_sell(trade, sell_rate, buy, sell): if self.check_sell(trade, sell_rate, buy, sell):
@ -488,7 +490,7 @@ with limit `{buy_limit:.8f} ({stake_amount:.6f} \
try: try:
# FIXME: Somehow the query above returns results # FIXME: Somehow the query above returns results
# where the open_order_id is in fact None. # where the open_order_id is in fact None.
# This is probably because the record got # This is probably because the record get_trades_for_order
# updated via /forcesell in a different thread. # updated via /forcesell in a different thread.
if not trade.open_order_id: if not trade.open_order_id:
continue continue

9
freqtrade/tests/test_freqtradebot.py
View File

@ -502,7 +502,8 @@ def test_balance_fully_ask_side(mocker) -> None:
""" """
Test get_target_bid() method Test get_target_bid() method
""" """
freqtrade = get_patched_freqtradebot(mocker, {'bid_strategy': {'use_book_order':False,'book_order_top':6,'ask_last_balance': 0.0}}) param = {'use_book_order': False, 'book_order_top': 6, 'ask_last_balance': 0.0}
freqtrade = get_patched_freqtradebot(mocker, {'bid_strategy': param})
assert freqtrade.get_target_bid('ETH/BTC') >= 0.07 assert freqtrade.get_target_bid('ETH/BTC') >= 0.07
@ -511,7 +512,8 @@ def test_balance_fully_last_side(mocker) -> None:
""" """
Test get_target_bid() method Test get_target_bid() method
""" """
freqtrade = get_patched_freqtradebot(mocker, {'bid_strategy': {'use_book_order':False,'book_order_top':6,'ask_last_balance': 1.0}}) param = {'use_book_order': False, 'book_order_top': 6, 'ask_last_balance': 0.0}
freqtrade = get_patched_freqtradebot(mocker, {'bid_strategy': param})
assert freqtrade.get_target_bid('ETH/BTC') >= 0.07 assert freqtrade.get_target_bid('ETH/BTC') >= 0.07
@ -520,7 +522,8 @@ def test_balance_bigger_last_ask(mocker) -> None:
""" """
Test get_target_bid() method Test get_target_bid() method
""" """
freqtrade = get_patched_freqtradebot(mocker, {'bid_strategy': {'use_book_order':False,'book_order_top':6,'ask_last_balance': 1.0}}) param = {'use_book_order': False, 'book_order_top': 6, 'ask_last_balance': 0.0}
freqtrade = get_patched_freqtradebot(mocker, {'bid_strategy': param})
assert freqtrade.get_target_bid('ETH/BTC') >= 0.07 assert freqtrade.get_target_bid('ETH/BTC') >= 0.07