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

rpc_counts should be in .rpc

Browse Source
This commit is contained in:
Matthias 2019-04-06 20:01:29 +02:00
parent 7a598f32dc
commit f139178136
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
freqtrade/rpc/rpc.py
View File

@ -454,7 +454,7 @@ class RPC(object):
for pair, rate, count in pair_rates for pair, rate, count in pair_rates
] ]
def _rpc_count(self) -> List[Trade]: def _rpc_count(self) -> Dict[str, float]:
""" Returns the number of trades running """ """ Returns the number of trades running """
if self._freqtrade.state != State.RUNNING: if self._freqtrade.state != State.RUNNING:
raise RPCException('trader is not running') raise RPCException('trader is not running')
@ -462,8 +462,8 @@ class RPC(object):
trades = Trade.get_open_trades() trades = Trade.get_open_trades()
return { return {
'current': len(trades), 'current': len(trades),
'max': self._config['max_open_trades'], 'max': float(self._freqtrade.config['max_open_trades']),
'total stake': sum((trade.open_rate * trade.amount) for trade in trades) 'total_stake': sum((trade.open_rate * trade.amount) for trade in trades)
} }
def _rpc_whitelist(self) -> Dict: def _rpc_whitelist(self) -> Dict:

10
freqtrade/tests/rpc/test_rpc.py
View File

@ -581,15 +581,13 @@ def test_rpc_count(mocker, default_conf, ticker, fee, markets) -> None:
patch_get_signal(freqtradebot, (True, False)) patch_get_signal(freqtradebot, (True, False))
rpc = RPC(freqtradebot) rpc = RPC(freqtradebot)
trades = rpc._rpc_count() counts = rpc._rpc_count()
nb_trades = len(trades) assert counts["current"] == 0
assert nb_trades == 0
# Create some test data # Create some test data
freqtradebot.create_trade() freqtradebot.create_trade()
trades = rpc._rpc_count() counts = rpc._rpc_count()
nb_trades = len(trades) assert counts["current"] == 1
assert nb_trades == 1
def test_rpcforcebuy(mocker, default_conf, ticker, fee, markets, limit_buy_order) -> None: def test_rpcforcebuy(mocker, default_conf, ticker, fee, markets, limit_buy_order) -> None: