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

Move rpc-count calculation to _rpc class

Browse Source
This commit is contained in:
Matthias 2019-04-06 19:58:45 +02:00
parent 0ac80aacd1
commit 7a598f32dc
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
freqtrade/rpc/rpc.py
View File

@ -459,7 +459,12 @@ class RPC(object):
if self._freqtrade.state != State.RUNNING: if self._freqtrade.state != State.RUNNING:
raise RPCException('trader is not running') raise RPCException('trader is not running')
return Trade.get_open_trades() trades = Trade.get_open_trades()
return {
'current': len(trades),
'max': self._config['max_open_trades'],
'total stake': sum((trade.open_rate * trade.amount) for trade in trades)
}
def _rpc_whitelist(self) -> Dict: def _rpc_whitelist(self) -> Dict:
""" Returns the currently active whitelist""" """ Returns the currently active whitelist"""

10
freqtrade/rpc/telegram.py
View File

@ -456,12 +456,10 @@ class Telegram(RPC):
:return: None :return: None
""" """
try: try:
trades = self._rpc_count() counts = self._rpc_count()
message = tabulate({ message = tabulate({k: [v] for k, v in counts.items()},
'current': [len(trades)], headers=['current', 'max', 'total stake'],
'max': [self._config['max_open_trades']], tablefmt='simple')
'total stake': [sum((trade.open_rate * trade.amount) for trade in trades)]
}, headers=['current', 'max', 'total stake'], tablefmt='simple')
message = "<pre>{}</pre>".format(message) message = "<pre>{}</pre>".format(message)
logger.debug(message) logger.debug(message)
self._send_msg(message, parse_mode=ParseMode.HTML) self._send_msg(message, parse_mode=ParseMode.HTML)