From 76907cb4d69992abfa2620b64d88cb8ef6d53087 Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 21 Jun 2022 06:47:17 +0200 Subject: [PATCH] Small fixes to align backtesting with live --- freqtrade/freqtradebot.py | 3 ++- freqtrade/optimize/backtesting.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py index 7aab0cdc7..07e8ed073 100644 --- a/freqtrade/freqtradebot.py +++ b/freqtrade/freqtradebot.py @@ -539,7 +539,8 @@ class FreqtradeBot(LoggingMixin): logger.debug(f"Calling adjust_trade_position for pair {trade.pair}") stake_amount = strategy_safe_wrapper(self.strategy.adjust_trade_position, default_retval=None)( - trade=trade, current_time=datetime.now(timezone.utc), current_rate=current_entry_rate, + trade=trade, + current_time=datetime.now(timezone.utc), current_rate=current_entry_rate, current_profit=current_entry_profit, min_stake=min_entry_stake, max_stake=min(max_entry_stake, stake_available), current_entry_rate=current_entry_rate, current_exit_rate=current_exit_rate, diff --git a/freqtrade/optimize/backtesting.py b/freqtrade/optimize/backtesting.py index 5844c12b5..3e4b8c13a 100644 --- a/freqtrade/optimize/backtesting.py +++ b/freqtrade/optimize/backtesting.py @@ -522,8 +522,8 @@ class Backtesting: if stake_amount is not None and stake_amount < 0.0: amount = abs(stake_amount) / current_rate if amount > trade.amount: - # selling more than available is not supported. - return trade + # This is currently ineffective as remaining would become < min tradable + amount = trade.amount remaining = (trade.amount - amount) * current_rate if remaining < min_stake: # Remaining stake is too low to be sold.