From b83487a70d32d71b3fea8998f619bfd984383887 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Thu, 26 Dec 2019 19:52:08 +0100
Subject: [PATCH] Extract default dataframe columns to constant

---
 freqtrade/constants.py                         | 1 +
 freqtrade/data/converter.py                    | 5 +++--
 freqtrade/data/datahandlers/jsondatahandler.py | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/freqtrade/constants.py b/freqtrade/constants.py
index 9c7e3db63..8d9cde98b 100644
--- a/freqtrade/constants.py
+++ b/freqtrade/constants.py
@@ -21,6 +21,7 @@ AVAILABLE_PAIRLISTS = ['StaticPairList', 'VolumePairList', 'PrecisionFilter', 'P
 AVAILABLE_DATAHANDLERS = ['json', 'jsongz']
 DRY_RUN_WALLET = 1000
 MATH_CLOSE_PREC = 1e-14  # Precision used for float comparisons
+DEFAULT_DATAFRAME_COLUMNS = ['date', 'open', 'high', 'low', 'close', 'volume']
 
 USERPATH_HYPEROPTS = 'hyperopts'
 USERPATH_STRATEGY = 'strategies'
diff --git a/freqtrade/data/converter.py b/freqtrade/data/converter.py
index 09f7e3278..41a843e36 100644
--- a/freqtrade/data/converter.py
+++ b/freqtrade/data/converter.py
@@ -8,6 +8,7 @@ import pandas as pd
 from pandas import DataFrame, to_datetime
 
 from freqtrade.configuration.timerange import TimeRange
+from freqtrade.constants import DEFAULT_DATAFRAME_COLUMNS
 
 logger = logging.getLogger(__name__)
 
@@ -26,7 +27,7 @@ def parse_ticker_dataframe(ticker: list, timeframe: str, pair: str, *,
     :return: DataFrame
     """
     logger.debug("Parsing tickerlist to dataframe")
-    cols = ['date', 'open', 'high', 'low', 'close', 'volume']
+    cols = DEFAULT_DATAFRAME_COLUMNS
     frame = DataFrame(ticker, columns=cols)
 
     frame['date'] = to_datetime(frame['date'],
@@ -173,4 +174,4 @@ def trades_to_ohlcv(trades: list, timeframe: str) -> DataFrame:
     df_new['date'] = df_new.index
     # Drop 0 volume rows
     df_new = df_new.dropna()
-    return df_new[['date', 'open', 'high', 'low', 'close', 'volume']]
+    return df_new[DEFAULT_DATAFRAME_COLUMNS]
diff --git a/freqtrade/data/datahandlers/jsondatahandler.py b/freqtrade/data/datahandlers/jsondatahandler.py
index e76fee2b9..1a26671b9 100644
--- a/freqtrade/data/datahandlers/jsondatahandler.py
+++ b/freqtrade/data/datahandlers/jsondatahandler.py
@@ -7,6 +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
 
 from .idatahandler import IDataHandler
 
@@ -14,7 +15,7 @@ from .idatahandler import IDataHandler
 class JsonDataHandler(IDataHandler):
 
     _use_zip = False
-    _columns = ['date', 'open', 'high', 'low', 'close', 'volume']
+    _columns = DEFAULT_DATAFRAME_COLUMNS
 
     @classmethod
     def ohlcv_get_pairs(cls, datadir: Path, timeframe: str) -> List[str]: