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

Imrpove code by reusing available properties

Browse Source
This commit is contained in:
Matthias
2022-01-23 18:59:09 +01:00
parent cc3852daf3
commit 7429f535c1
6 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
freqtrade/freqtradebot.py
View File

@@ -474,8 +474,7 @@ class FreqtradeBot(LoggingMixin):
Once that completes, the existing trade is modified to match new data.
"""
if self.strategy.max_buy_position_adjustment > -1:
filled_buys = trade.select_filled_orders('buy')
count_of_buys = len(filled_buys)
count_of_buys = trade.nr_of_successful_buys
if count_of_buys > self.strategy.max_buy_position_adjustment:
logger.debug(f"Max adjustment buy for {trade.pair} has been reached.")
return

3
freqtrade/optimize/backtesting.py
View File

@@ -383,8 +383,7 @@ class Backtesting:
if self.strategy.position_adjustment_enable:
check_adjust_buy = True
if self.strategy.max_buy_position_adjustment > -1:
filled_buys = trade.select_filled_orders('buy')
count_of_buys = len(filled_buys)
count_of_buys = trade.nr_of_successful_buys
check_adjust_buy = (count_of_buys <= self.strategy.max_buy_position_adjustment)
if check_adjust_buy:
trade = self._get_adjust_trade_entry_for_candle(trade, sell_row)

2
freqtrade/resolvers/strategy_resolver.py
View File

@@ -98,7 +98,7 @@ class StrategyResolver(IResolver):
("disable_dataframe_checks", False),
("ignore_buying_expired_candle_after", 0),
("position_adjustment_enable", False),
("max_buy_position_adjustment", -1)
("max_buy_position_adjustment", -1),
]
for attribute, default in attributes:
StrategyResolver._override_attribute_helper(strategy, config,

4
freqtrade/rpc/rpc.py
View File

@@ -252,8 +252,8 @@ class RPC:
]
if self._config.get('position_adjustment_enable', False):
max_buy = self._config['max_buy_position_adjustment'] + 1
filled_buys = trade.select_filled_orders('buy')
detail_trade.append(f"{len(filled_buys)}/{max_buy}")
filled_buys = trade.nr_of_successful_buys
detail_trade.append(f"{filled_buys}/{max_buy}")
trades_list.append(detail_trade)
profitcol = "Profit"
if self._fiat_converter: