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

show_config should not use freqtrade object

Browse Source
This commit is contained in:
Matthias 2020-08-01 17:55:03 +02:00
parent 1de248fe38
commit c59a1be154
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freqtrade/rpc/api_server.py
View File

@ -328,7 +328,7 @@ class ApiServer(RPC):
""" """
Prints the bot's version Prints the bot's version
""" """
return self.rest_dump(self._rpc_show_config()) return self.rest_dump(self._rpc_show_config(self._config))
@require_login @require_login
@rpc_catch_errors @rpc_catch_errors

5
freqtrade/rpc/rpc.py
View File

@ -93,13 +93,12 @@ class RPC:
def send_msg(self, msg: Dict[str, str]) -> None: def send_msg(self, msg: Dict[str, str]) -> None:
""" Sends a message to all registered rpc modules """ """ Sends a message to all registered rpc modules """
def _rpc_show_config(self) -> Dict[str, Any]: def _rpc_show_config(self, config) -> Dict[str, Any]:
""" """
Return a dict of config options. Return a dict of config options.
Explicitly does NOT return the full config to avoid leakage of sensitive Explicitly does NOT return the full config to avoid leakage of sensitive
information via rpc. information via rpc.
""" """
config = self._freqtrade.config
val = { val = {
'dry_run': config['dry_run'], 'dry_run': config['dry_run'],
'stake_currency': config['stake_currency'], 'stake_currency': config['stake_currency'],
@ -120,7 +119,7 @@ class RPC:
'forcebuy_enabled': config.get('forcebuy_enable', False), 'forcebuy_enabled': config.get('forcebuy_enable', False),
'ask_strategy': config.get('ask_strategy', {}), 'ask_strategy': config.get('ask_strategy', {}),
'bid_strategy': config.get('bid_strategy', {}), 'bid_strategy': config.get('bid_strategy', {}),
'state': str(self._freqtrade.state) 'state': str(self._freqtrade.state) if self._freqtrade else '',
} }
return val return val

2
freqtrade/rpc/telegram.py
View File

@ -755,7 +755,7 @@ class Telegram(RPC):
:param update: message update :param update: message update
:return: None :return: None
""" """
val = self._rpc_show_config() val = self._rpc_show_config(self._freqtrade.config)
if val['trailing_stop']: if val['trailing_stop']:
sl_info = ( sl_info = (
f"*Initial Stoploss:* `{val['stoploss']}`\n" f"*Initial Stoploss:* `{val['stoploss']}`\n"