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

[SQUASH] Get rid of _initialize() and fix informatives for dynamic pairlists.

Browse Source
This commit is contained in:
Rokas Kupstys
2021-09-10 09:36:52 +03:00
parent f81df19b93
commit 5dc78a0c66
6 changed files with 27 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
freqtrade/strategy/strategy_helper.py
View File

@@ -171,14 +171,13 @@ def _format_pair_name(config, pair: str) -> str:
stake=config['stake_currency']).upper()
def _create_and_merge_informative_pair(strategy, dataframe: DataFrame,
metadata: dict, informative_data: InformativeData,
populate_indicators: Callable[[Any, DataFrame, dict],
DataFrame]):
asset = informative_data.asset or ''
timeframe = informative_data.timeframe
fmt = informative_data.fmt
ffill = informative_data.ffill
def _create_and_merge_informative_pair(strategy, dataframe: DataFrame, metadata: dict,
inf_data: InformativeData,
populate_indicators: PopulateIndicators):
asset = inf_data.asset or ''
timeframe = inf_data.timeframe
fmt = inf_data.fmt
ffill = inf_data.ffill
config = strategy.config
dp = strategy.dp
@@ -205,7 +204,7 @@ def _create_and_merge_informative_pair(strategy, dataframe: DataFrame,
fmt = '{column}_{timeframe}' # Informatives of current pair
if quote != config['stake_currency']:
fmt = '{quote}_' + fmt # Informatives of different quote currency
if informative_data.asset:
if inf_data.asset:
fmt = '{base}_' + fmt # Informatives of other pair
inf_metadata = {'pair': asset, 'timeframe': timeframe}