Fix kraken get_balance currency/alternate_currency

Author: RetGal

balancer.py

@@ -54,7 +54,7 @@ def __init__(self):
 
         try:
             props = config['config']
-            self.bot_version = '1.5.0'
+            self.bot_version = '1.5.1'
             self.exchange = str(props['exchange']).strip('"').lower()
             self.api_key = str(props['api_key']).strip('"')
             self.api_secret = str(props['api_secret']).strip('"')
@@ -1532,13 +1532,17 @@ def get_fiat_balance():
 
 def get_balance(currency: str):
     try:
+        alt_currency = ''
         if CONF.exchange == 'kraken':
             if currency == 'BTC':
-                currency = 'XBT'
-            currency += '.F'
+                alt_currency = 'XBT.F'
+            else:
+                alt_currency = currency + '.F'
         balance_result = {'free': 0, 'used': 0, 'total': 0}
         bal = EXCHANGE.fetch_balance()
-        if currency in bal and bal[currency]:
+        if currency in bal or alt_currency in bal:
+            if alt_currency in bal and bal[alt_currency]['total'] > 0:
+                currency = alt_currency
             if 'free' in bal[currency]:
                 balance_result['free'] = bal[currency]['free'] or 0
             if 'used' in bal[currency]:

balancer_test.py

@@ -927,7 +927,22 @@ def test_get_balance(self, mock_fetch_balance, mock_logging):
         balancer.CONF.test = False
         balancer.LOG = mock_logging
         balancer.EXCHANGE = balancer.connect_to_exchange()
-        mock_fetch_balance.return_value = {'XBT.F': {'used': None, 'free': None, 'total': 0.9}}
+        mock_fetch_balance.return_value = {'BTC': {'used': None, 'free': None, 'total': 0.9}, 'XBT.F': {'total': 0}}
+
+        balance = balancer.get_crypto_balance()
+
+        self.assertEqual(0, balance['used'])
+        self.assertEqual(0, balance['free'])
+        self.assertEqual(0.9, balance['total'])
+
+    @patch('balancer.logging')
+    @mock.patch.object(ccxt.kraken, 'fetch_balance')
+    def test_get_balance_alternative_currency(self, mock_fetch_balance, mock_logging):
+        balancer.CONF = self.create_default_conf()
+        balancer.CONF.test = False
+        balancer.LOG = mock_logging
+        balancer.EXCHANGE = balancer.connect_to_exchange()
+        mock_fetch_balance.return_value = {'BTC': {'total': 0}, 'XBT.F': {'used': None, 'free': None, 'total': 0.9}}
 
         balance = balancer.get_crypto_balance()