From 50350a09cd494c802a1586cfaec9bf78ef876c4f Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Sun, 24 Nov 2019 19:41:51 +0100
Subject: [PATCH] use wallets instead of doing a direct call to /balance

---
 freqtrade/rpc/rpc.py            | 14 +++++++-------
 freqtrade/wallets.py            |  5 ++++-
 tests/rpc/test_rpc_apiserver.py |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py
index 137e72ea6..4cebe646e 100644
--- a/freqtrade/rpc/rpc.py
+++ b/freqtrade/rpc/rpc.py
@@ -306,14 +306,14 @@ class RPC:
         except (TemporaryError, DependencyException):
             raise RPCException('Error getting current tickers.')
 
-        for coin, balance in self._freqtrade.exchange.get_balances().items():
-            if not balance['total']:
+        for coin, balance in self._freqtrade.wallets.get_all_balances().items():
+            if not balance.total:
                 continue
 
             est_stake: float = 0
             if coin == stake_currency:
                 rate = 1.0
-                est_stake = balance['total']
+                est_stake = balance.total
             else:
                 try:
                     pair = self._freqtrade.exchange.get_valid_pair_combination(coin, stake_currency)
@@ -321,16 +321,16 @@ class RPC:
                     if rate:
                         if pair.startswith(stake_currency):
                             rate = 1.0 / rate
-                        est_stake = rate * balance['total']
+                        est_stake = rate * balance.total
                 except (TemporaryError, DependencyException):
                     logger.warning(f" Could not get rate for pair {coin}.")
                     continue
             total = total + (est_stake or 0)
             output.append({
                 'currency': coin,
-                'free': balance['free'] if balance['free'] is not None else 0,
-                'balance': balance['total'] if balance['total'] is not None else 0,
-                'used': balance['used'] if balance['used'] is not None else 0,
+                'free': balance.free if balance.free is not None else 0,
+                'balance': balance.total if balance.total is not None else 0,
+                'used': balance.used if balance.used is not None else 0,
                 'est_stake': est_stake or 0,
                 'stake': stake_currency,
             })
diff --git a/freqtrade/wallets.py b/freqtrade/wallets.py
index 90b68c49d..c674b5286 100644
--- a/freqtrade/wallets.py
+++ b/freqtrade/wallets.py
@@ -2,7 +2,7 @@
 """ Wallet """
 
 import logging
-from typing import Dict, NamedTuple
+from typing import Dict, NamedTuple, Any
 from freqtrade.exchange import Exchange
 from freqtrade import constants
 
@@ -72,3 +72,6 @@ class Wallets:
             )
 
         logger.info('Wallets synced.')
+
+    def get_all_balances(self) -> Dict[str, Any]:
+        return self._wallets
diff --git a/tests/rpc/test_rpc_apiserver.py b/tests/rpc/test_rpc_apiserver.py
index 4dc3fd265..7b3e787f4 100644
--- a/tests/rpc/test_rpc_apiserver.py
+++ b/tests/rpc/test_rpc_apiserver.py
@@ -243,9 +243,9 @@ def test_api_balance(botclient, mocker, rpc_balance):
             'last': 0.1,
         }
     mocker.patch('freqtrade.exchange.Exchange.get_balances', return_value=rpc_balance)
-    mocker.patch('freqtrade.exchange.Exchange.get_ticker', side_effect=mock_ticker)
     mocker.patch('freqtrade.exchange.Exchange.get_valid_pair_combination',
                  side_effect=lambda a, b: f"{a}/{b}")
+    ftbot.wallets.update()
 
     rc = client_get(client, f"{BASE_URI}/balance")
     assert_response(rc)