lychiyu/freqtrade_origin
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2024-11-14 04:03:55 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1460 from freqtrade/fix/stop_loss_result

Browse Source 
Stop loss should also be shown when trailing is active
This commit is contained in:
Misagh 2019-01-02 16:41:15 +01:00 committed by GitHub
commit 3b5785884f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
freqtrade/strategy/interface.py
View File

@ -278,7 +278,8 @@ class IStrategy(ABC):
# evaluate if the stoploss was hit # evaluate if the stoploss was hit
if self.stoploss is not None and trade.stop_loss >= current_rate: if self.stoploss is not None and trade.stop_loss >= current_rate:
selltype = SellType.STOP_LOSS selltype = SellType.STOP_LOSS
if trailing_stop: # If Trailing stop (and max-rate did move above open rate)
if trailing_stop and trade.open_rate != trade.max_rate:
selltype = SellType.TRAILING_STOP_LOSS selltype = SellType.TRAILING_STOP_LOSS
logger.debug( logger.debug(
f"HIT STOP: current price at {current_rate:.6f}, " f"HIT STOP: current price at {current_rate:.6f}, "

1
freqtrade/tests/test_freqtradebot.py
View File

@ -2066,6 +2066,7 @@ def test_trailing_stop_loss(default_conf, limit_buy_order, fee, markets, caplog,
trade = Trade.query.first() trade = Trade.query.first()
trade.update(limit_buy_order) trade.update(limit_buy_order)
trade.max_rate = trade.open_rate * 1.003
caplog.set_level(logging.DEBUG) caplog.set_level(logging.DEBUG)
# Sell as trailing-stop is reached # Sell as trailing-stop is reached
assert freqtrade.handle_trade(trade) is True assert freqtrade.handle_trade(trade) is True