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

Some more replacements of ticker_interval

Browse Source
This commit is contained in:
Matthias 2020-06-02 09:41:42 +02:00
parent 947903a4ac
commit 3e895ae74a
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
freqtrade/optimize/hyperopt_loss_interface.py
View File

@ -15,6 +15,7 @@ class IHyperOptLoss(ABC):
Defines the custom loss function (`hyperopt_loss_function()` which is evaluated every epoch.) Defines the custom loss function (`hyperopt_loss_function()` which is evaluated every epoch.)
""" """
ticker_interval: str ticker_interval: str
timeframe: str
@staticmethod @staticmethod
@abstractmethod @abstractmethod

1
freqtrade/persistence.py
View File

@ -288,6 +288,7 @@ class Trade(_DECL_BASE):
'max_rate': self.max_rate, 'max_rate': self.max_rate,
'strategy': self.strategy, 'strategy': self.strategy,
'ticker_interval': self.ticker_interval, 'ticker_interval': self.ticker_interval,
'timeframe': self.ticker_interval,
'open_order_id': self.open_order_id, 'open_order_id': self.open_order_id,
'exchange': self.exchange, 'exchange': self.exchange,
} }

2
tests/data/test_dataprovider.py
View File

@ -104,7 +104,7 @@ def test_refresh(mocker, default_conf, ohlcv_history):
timeframe = default_conf["timeframe"] timeframe = default_conf["timeframe"]
pairs = [("XRP/BTC", timeframe), ("UNITTEST/BTC", timeframe)] pairs = [("XRP/BTC", timeframe), ("UNITTEST/BTC", timeframe)]
pairs_non_trad = [("ETH/USDT", ticker_interval), ("BTC/TUSD", "1h")] pairs_non_trad = [("ETH/USDT", timeframe), ("BTC/TUSD", "1h")]
dp = DataProvider(default_conf, exchange) dp = DataProvider(default_conf, exchange)
dp.refresh(pairs) dp.refresh(pairs)

2
tests/test_configuration.py
View File

@ -87,7 +87,7 @@ def test_load_config_file_error_range(default_conf, mocker, caplog) -> None:
assert isinstance(x, str) assert isinstance(x, str)
assert (x == '{"max_open_trades": 1, "stake_currency": "BTC", ' assert (x == '{"max_open_trades": 1, "stake_currency": "BTC", '
'"stake_amount": .001, "fiat_display_currency": "USD", ' '"stake_amount": .001, "fiat_display_currency": "USD", '
'"timeframe": "5m", "dry_run": true, ') '"timeframe": "5m", "dry_run": true, "cance')
def test__args_to_config(caplog): def test__args_to_config(caplog):