diff --git a/freqtrade/data/converter.py b/freqtrade/data/converter.py index 3c9e78132..1e80ba13e 100644 --- a/freqtrade/data/converter.py +++ b/freqtrade/data/converter.py @@ -225,6 +225,17 @@ def trades_dict_to_list(trades: List[Dict]) -> TradeList: return [[t[col] for col in DEFAULT_TRADES_COLUMNS] for t in trades] +def trades_list_to_df(trades: TradeList): + """ + convert trades list to dataframe + :param trades: List of Lists with constants.DEFAULT_TRADES_COLUMNS as columns + """ + if not trades: + return DataFrame(columns=DEFAULT_TRADES_COLUMNS) + df = DataFrame(trades, columns=DEFAULT_TRADES_COLUMNS) + return df + + def trades_to_ohlcv(trades: DataFrame, timeframe: str) -> DataFrame: """ Converts trades list to OHLCV list diff --git a/freqtrade/data/history/jsondatahandler.py b/freqtrade/data/history/jsondatahandler.py index b6f5a5131..f4ef3f74d 100644 --- a/freqtrade/data/history/jsondatahandler.py +++ b/freqtrade/data/history/jsondatahandler.py @@ -7,7 +7,7 @@ from pandas import DataFrame, read_json, to_datetime from freqtrade import misc from freqtrade.configuration import TimeRange from freqtrade.constants import DEFAULT_DATAFRAME_COLUMNS, DEFAULT_TRADES_COLUMNS -from freqtrade.data.converter import trades_dict_to_list +from freqtrade.data.converter import trades_dict_to_list, trades_list_to_df from freqtrade.enums import CandleType from .idatahandler import IDataHandler @@ -134,8 +134,7 @@ class JsonDataHandler(IDataHandler): logger.info("Old trades format detected - converting") tradesdata = trades_dict_to_list(tradesdata) pass - trades = DataFrame(tradesdata, columns=DEFAULT_TRADES_COLUMNS) - return trades + return trades_list_to_df(tradesdata) @classmethod def _get_file_extension(cls):