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

Add stake_currency to strategy, fix documentation typo

Browse Source
This commit is contained in:
Matthias 2019-03-23 20:40:07 +01:00
parent 6312d785d8
commit 06f4e627fc
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/bot-optimization.md
View File

@ -278,13 +278,13 @@ Please always check if the `DataProvider` is available to avoid failures during
``` python ``` python
if self.dp: if self.dp:
if dp.runmode == 'live': if self.dp.runmode == 'live':
if ('ETH/BTC', ticker_interval) in self.dp.available_pairs: if (f'{self.stake_currency}/BTC', self.ticker_interval) in self.dp.available_pairs:
data_eth = self.dp.ohlcv(pair='ETH/BTC', data_eth = self.dp.ohlcv(pair='{self.stake_currency}/BTC',
ticker_interval=ticker_interval) ticker_interval=self.ticker_interval)
else: else:
# Get historic ohlcv data (cached on disk). # Get historic ohlcv data (cached on disk).
history_eth = self.dp.historic_ohlcv(pair='ETH/BTC', history_eth = self.dp.historic_ohlcv(pair='{self.stake_currency}/BTC',
ticker_interval='1h') ticker_interval='1h')
``` ```

2
freqtrade/resolvers/strategy_resolver.py
View File

@ -56,6 +56,8 @@ class StrategyResolver(IResolver):
("process_only_new_candles", None, False), ("process_only_new_candles", None, False),
("order_types", None, False), ("order_types", None, False),
("order_time_in_force", None, False), ("order_time_in_force", None, False),
("stake_currency", None, False),
("stake_amount", None, False),
("use_sell_signal", False, True), ("use_sell_signal", False, True),
("sell_profit_only", False, True), ("sell_profit_only", False, True),
("ignore_roi_if_buy_signal", False, True), ("ignore_roi_if_buy_signal", False, True),

4
freqtrade/tests/strategy/test_strategy.py
View File

@ -194,11 +194,13 @@ def test_strategy_override_ticker_interval(caplog):
config = { config = {
'strategy': 'DefaultStrategy', 'strategy': 'DefaultStrategy',
'ticker_interval': 60 'ticker_interval': 60,
'stake_currency': 'ETH'
} }
resolver = StrategyResolver(config) resolver = StrategyResolver(config)
assert resolver.strategy.ticker_interval == 60 assert resolver.strategy.ticker_interval == 60
assert resolver.strategy.stake_currency == 'ETH'
assert ('freqtrade.resolvers.strategy_resolver', assert ('freqtrade.resolvers.strategy_resolver',
logging.INFO, logging.INFO,
"Override strategy 'ticker_interval' with value in config file: 60." "Override strategy 'ticker_interval' with value in config file: 60."