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

Fix some types

Browse Source
This commit is contained in:
Matthias 2020-10-02 06:41:28 +02:00
parent 62110dc2fc
commit 66b77d2f53
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
freqtrade/rpc/rpc.py
View File

@ -711,15 +711,15 @@ class RPC:
return self._convert_dataframe_to_dict(self._freqtrade.config['strategy'], return self._convert_dataframe_to_dict(self._freqtrade.config['strategy'],
pair, timeframe, _data, last_analyzed) pair, timeframe, _data, last_analyzed)
def _rpc_analysed_history_full(self, config: Dict[str, any], pair: str, timeframe: str, def _rpc_analysed_history_full(self, config, pair: str, timeframe: str,
timerange: str) -> Dict[str, Any]: timerange: str) -> Dict[str, Any]:
timerange = TimeRange.parse_timerange(timerange) timerange_parsed = TimeRange.parse_timerange(timerange)
_data = load_data( _data = load_data(
datadir=config.get("datadir"), datadir=config.get("datadir"),
pairs=[pair], pairs=[pair],
timeframe=timeframe, timeframe=timeframe,
timerange=timerange, timerange=timerange_parsed,
data_format=config.get('dataformat_ohlcv', 'json'), data_format=config.get('dataformat_ohlcv', 'json'),
) )
from freqtrade.resolvers.strategy_resolver import StrategyResolver from freqtrade.resolvers.strategy_resolver import StrategyResolver

2
freqtrade/strategy/interface.py
View File

@ -123,6 +123,8 @@ class IStrategy(ABC):
# and wallets - access to the current balance. # and wallets - access to the current balance.
dp: Optional[DataProvider] = None dp: Optional[DataProvider] = None
wallets: Optional[Wallets] = None wallets: Optional[Wallets] = None
# container variable for strategy source code
__source__: str = ''
# Definition of plot_config. See plotting documentation for more details. # Definition of plot_config. See plotting documentation for more details.
plot_config: Dict = {} plot_config: Dict = {}

4
tests/rpc/test_rpc_apiserver.py
View File

@ -840,7 +840,7 @@ def test_api_pair_candles(botclient, ohlcv_history):
assert len(rc.json['data']) == 0 assert len(rc.json['data']) == 0
ohlcv_history['sma'] = ohlcv_history['close'].rolling(2).mean() ohlcv_history['sma'] = ohlcv_history['close'].rolling(2).mean()
ohlcv_history['buy'] = 0 ohlcv_history['buy'] = 0
ohlcv_history.iloc[1]['buy'] = 1 ohlcv_history.loc[1, 'buy'] = 1
ohlcv_history['sell'] = 0 ohlcv_history['sell'] = 0
ftbot.dataprovider._set_cached_df("XRP/BTC", timeframe, ohlcv_history) ftbot.dataprovider._set_cached_df("XRP/BTC", timeframe, ohlcv_history)
@ -873,7 +873,7 @@ def test_api_pair_candles(botclient, ohlcv_history):
[['2017-11-26 08:50:00', 8.794e-05, 8.948e-05, 8.794e-05, 8.88e-05, 0.0877869, [['2017-11-26 08:50:00', 8.794e-05, 8.948e-05, 8.794e-05, 8.88e-05, 0.0877869,
None, 0, 0, 1511686200000, None, None], None, 0, 0, 1511686200000, None, None],
['2017-11-26 08:55:00', 8.88e-05, 8.942e-05, 8.88e-05, ['2017-11-26 08:55:00', 8.88e-05, 8.942e-05, 8.88e-05,
8.893e-05, 0.05874751, 8.886500000000001e-05, 0, 0, 1511686500000, None, None] 8.893e-05, 0.05874751, 8.886500000000001e-05, 1, 0, 1511686500000, 8.88e-05, None]
]) ])