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

Merge pull request #1977 from hroff-1902/cleanup/freqtradebot

Browse Source 
partial freqtradebot cleanup
This commit is contained in:
Matthias 2019-06-30 19:52:35 +02:00 committed by GitHub
commit 79ae3c2f2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
freqtrade/freqtradebot.py
View File

@ -592,13 +592,13 @@ class FreqtradeBot(object):
logger.info(' order book asks top %s: %0.8f', i, order_book_rate) logger.info(' order book asks top %s: %0.8f', i, order_book_rate)
sell_rate = order_book_rate sell_rate = order_book_rate
if self.check_sell(trade, sell_rate, buy, sell): if self._check_and_execute_sell(trade, sell_rate, buy, sell):
return True return True
else: else:
logger.debug('checking sell') logger.debug('checking sell')
sell_rate = self.get_sell_rate(trade.pair, True) sell_rate = self.get_sell_rate(trade.pair, True)
if self.check_sell(trade, sell_rate, buy, sell): if self._check_and_execute_sell(trade, sell_rate, buy, sell):
return True return True
logger.debug('Found no sell signal for %s.', trade) logger.debug('Found no sell signal for %s.', trade)
@ -668,7 +668,7 @@ class FreqtradeBot(object):
if stoploss_order and stoploss_order['status'] == 'closed': if stoploss_order and stoploss_order['status'] == 'closed':
trade.sell_reason = SellType.STOPLOSS_ON_EXCHANGE.value trade.sell_reason = SellType.STOPLOSS_ON_EXCHANGE.value
trade.update(stoploss_order) trade.update(stoploss_order)
self.notify_sell(trade) self._notify_sell(trade)
return True return True
# Finally we check if stoploss on exchange should be moved up because of trailing. # Finally we check if stoploss on exchange should be moved up because of trailing.
@ -713,13 +713,15 @@ class FreqtradeBot(object):
logger.exception(f"Could create trailing stoploss order " logger.exception(f"Could create trailing stoploss order "
f"for pair {trade.pair}.") f"for pair {trade.pair}.")
def check_sell(self, trade: Trade, sell_rate: float, buy: bool, sell: bool) -> bool: def _check_and_execute_sell(self, trade: Trade, sell_rate: float,
if self.edge: buy: bool, sell: bool) -> bool:
stoploss = self.edge.stoploss(trade.pair) """
Check and execute sell
"""
should_sell = self.strategy.should_sell( should_sell = self.strategy.should_sell(
trade, sell_rate, datetime.utcnow(), buy, sell, force_stoploss=stoploss) trade, sell_rate, datetime.utcnow(), buy, sell,
else: force_stoploss=self.edge.stoploss(trade.pair) if self.edge else 0
should_sell = self.strategy.should_sell(trade, sell_rate, datetime.utcnow(), buy, sell) )
if should_sell.sell_flag: if should_sell.sell_flag:
self.execute_sell(trade, sell_rate, should_sell.sell_type) self.execute_sell(trade, sell_rate, should_sell.sell_type)
@ -873,9 +875,9 @@ class FreqtradeBot(object):
trade.close_rate_requested = limit trade.close_rate_requested = limit
trade.sell_reason = sell_reason.value trade.sell_reason = sell_reason.value
Trade.session.flush() Trade.session.flush()
self.notify_sell(trade) self._notify_sell(trade)
def notify_sell(self, trade: Trade): def _notify_sell(self, trade: Trade):
""" """
Sends rpc notification when a sell occured. Sends rpc notification when a sell occured.
""" """