No need to use .get() for properties with default values

This commit is contained in:
Matthias
2023-07-12 18:27:46 +02:00
parent 5399253786
commit b593205ad9
7 changed files with 12 additions and 11 deletions

View File

@@ -310,7 +310,7 @@ class DataProvider:
timeframe=timeframe or self._config['timeframe'], timeframe=timeframe or self._config['timeframe'],
datadir=self._config['datadir'], datadir=self._config['datadir'],
timerange=timerange, timerange=timerange,
data_format=self._config.get('dataformat_ohlcv', 'feather'), data_format=self._config['dataformat_ohlcv'],
candle_type=_candle_type, candle_type=_candle_type,
) )

View File

@@ -115,7 +115,7 @@ class Edge:
exchange=self.exchange, exchange=self.exchange,
timeframe=self.strategy.timeframe, timeframe=self.strategy.timeframe,
timerange=timerange_startup, timerange=timerange_startup,
data_format=self.config.get('dataformat_ohlcv', 'feather'), data_format=self.config['dataformat_ohlcv'],
candle_type=self.config.get('candle_type_def', CandleType.SPOT), candle_type=self.config.get('candle_type_def', CandleType.SPOT),
) )
# Download informative pairs too # Download informative pairs too
@@ -132,7 +132,7 @@ class Edge:
exchange=self.exchange, exchange=self.exchange,
timeframe=timeframe, timeframe=timeframe,
timerange=timerange_startup, timerange=timerange_startup,
data_format=self.config.get('dataformat_ohlcv', 'feather'), data_format=self.config['dataformat_ohlcv'],
candle_type=self.config.get('candle_type_def', CandleType.SPOT), candle_type=self.config.get('candle_type_def', CandleType.SPOT),
) )
@@ -142,7 +142,7 @@ class Edge:
timeframe=self.strategy.timeframe, timeframe=self.strategy.timeframe,
timerange=self._timerange, timerange=self._timerange,
startup_candles=self.strategy.startup_candle_count, startup_candles=self.strategy.startup_candle_count,
data_format=self.config.get('dataformat_ohlcv', 'feather'), data_format=self.config['dataformat_ohlcv'],
candle_type=self.config.get('candle_type_def', CandleType.SPOT), candle_type=self.config.get('candle_type_def', CandleType.SPOT),
) )

View File

@@ -239,7 +239,7 @@ class Backtesting:
timerange=self.timerange, timerange=self.timerange,
startup_candles=self.config['startup_candle_count'], startup_candles=self.config['startup_candle_count'],
fail_without_data=True, fail_without_data=True,
data_format=self.config.get('dataformat_ohlcv', 'feather'), data_format=self.config['dataformat_ohlcv'],
candle_type=self.config.get('candle_type_def', CandleType.SPOT) candle_type=self.config.get('candle_type_def', CandleType.SPOT)
) )
@@ -268,7 +268,7 @@ class Backtesting:
timerange=self.timerange, timerange=self.timerange,
startup_candles=0, startup_candles=0,
fail_without_data=True, fail_without_data=True,
data_format=self.config.get('dataformat_ohlcv', 'feather'), data_format=self.config['dataformat_ohlcv'],
candle_type=self.config.get('candle_type_def', CandleType.SPOT) candle_type=self.config.get('candle_type_def', CandleType.SPOT)
) )
else: else:
@@ -282,7 +282,7 @@ class Backtesting:
timerange=self.timerange, timerange=self.timerange,
startup_candles=0, startup_candles=0,
fail_without_data=True, fail_without_data=True,
data_format=self.config.get('dataformat_ohlcv', 'feather'), data_format=self.config['dataformat_ohlcv'],
candle_type=CandleType.FUNDING_RATE candle_type=CandleType.FUNDING_RATE
) )
@@ -294,7 +294,7 @@ class Backtesting:
timerange=self.timerange, timerange=self.timerange,
startup_candles=0, startup_candles=0,
fail_without_data=True, fail_without_data=True,
data_format=self.config.get('dataformat_ohlcv', 'feather'), data_format=self.config['dataformat_ohlcv'],
candle_type=CandleType.from_string(self.exchange.get_option("mark_ohlcv_price")) candle_type=CandleType.from_string(self.exchange.get_option("mark_ohlcv_price"))
) )
# Combine data to avoid combining the data per trade. # Combine data to avoid combining the data per trade.

View File

@@ -55,7 +55,7 @@ def init_plotscript(config, markets: List, startup_candles: int = 0):
timeframe=config['timeframe'], timeframe=config['timeframe'],
timerange=timerange, timerange=timerange,
startup_candles=startup_candles, startup_candles=startup_candles,
data_format=config.get('dataformat_ohlcv', 'feather'), data_format=config['dataformat_ohlcv'],
candle_type=config.get('candle_type_def', CandleType.SPOT) candle_type=config.get('candle_type_def', CandleType.SPOT)
) )

View File

@@ -1245,7 +1245,7 @@ class RPC:
pairs=[pair], pairs=[pair],
timeframe=timeframe, timeframe=timeframe,
timerange=timerange_parsed, timerange=timerange_parsed,
data_format=config.get('dataformat_ohlcv', 'feather'), data_format=config['dataformat_ohlcv'],
candle_type=config.get('candle_type_def', CandleType.SPOT) candle_type=config.get('candle_type_def', CandleType.SPOT)
) )
if pair not in _data: if pair not in _data:

View File

@@ -64,7 +64,7 @@ def migrate_binance_futures_data(config: Config):
return return
from freqtrade.data.history.idatahandler import get_datahandler from freqtrade.data.history.idatahandler import get_datahandler
dhc = get_datahandler(config['datadir'], config.get('dataformat_ohlcv', 'feather')) dhc = get_datahandler(config['datadir'], config['dataformat_ohlcv'])
paircombs = dhc.ohlcv_get_available_data( paircombs = dhc.ohlcv_get_available_data(
config['datadir'], config['datadir'],

View File

@@ -526,6 +526,7 @@ def get_default_conf(testdatadir):
"disableparamexport": True, "disableparamexport": True,
"internals": {}, "internals": {},
"export": "none", "export": "none",
"dataformat_ohlcv": "feather",
"candle_type_def": CandleType.SPOT, "candle_type_def": CandleType.SPOT,
} }
return configuration return configuration