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

Merge pull request #1845 from freqtrade/fix/1840

Browse Source 
Fix #1840 - Support balances other than USDT
This commit is contained in:
Matthias 2019-05-15 19:39:46 +02:00 committed by GitHub
commit 175fc8591e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
freqtrade/rpc/rpc.py
View File

@ -276,11 +276,12 @@ class RPC(object):
rate = 1.0 rate = 1.0
else: else:
try: try:
if coin == 'USDT': if coin in('USDT', 'USD', 'EUR'):
rate = 1.0 / self._freqtrade.get_sell_rate('BTC/USDT', False) rate = 1.0 / self._freqtrade.get_sell_rate('BTC/' + coin, False)
else: else:
rate = self._freqtrade.get_sell_rate(coin + '/BTC', False) rate = self._freqtrade.get_sell_rate(coin + '/BTC', False)
except (TemporaryError, DependencyException): except (TemporaryError, DependencyException):
logger.warning(f" Could not get rate for pair {coin}.")
continue continue
est_btc: float = rate * balance['total'] est_btc: float = rate * balance['total']
total = total + est_btc total = total + est_btc

6
freqtrade/tests/rpc/test_rpc_telegram.py
View File

@ -522,6 +522,11 @@ def test_telegram_balance_handle(default_conf, update, mocker) -> None:
'total': 1.0, 'total': 1.0,
'free': 1.0, 'free': 1.0,
'used': 0.0 'used': 0.0
},
'EUR': {
'total': 10.0,
'free': 10.0,
'used': 0.0
} }
} }
@ -565,6 +570,7 @@ def test_telegram_balance_handle(default_conf, update, mocker) -> None:
assert '*BTC:*' in result assert '*BTC:*' in result
assert '*ETH:*' not in result assert '*ETH:*' not in result
assert '*USDT:*' in result assert '*USDT:*' in result
assert '*EUR:*' in result
assert 'Balance:' in result assert 'Balance:' in result
assert 'Est. BTC:' in result assert 'Est. BTC:' in result
assert 'BTC: 12.00000000' in result assert 'BTC: 12.00000000' in result