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

Merge pull request #4131 from freqtrade/fix/krakenbalance

Browse Source 
Fix/krakenbalance
This commit is contained in:
Matthias 2020-12-30 06:23:25 +01:00 committed by GitHub
commit 9d7e0514ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freqtrade/exchange/kraken.py
View File

@ -48,7 +48,7 @@ class Kraken(Exchange):
orders = self._api.fetch_open_orders() orders = self._api.fetch_open_orders()
order_list = [(x["symbol"].split("/")[0 if x["side"] == "sell" else 1], order_list = [(x["symbol"].split("/")[0 if x["side"] == "sell" else 1],
x["remaining"], x["remaining"] if x["side"] == "sell" else x["remaining"] * x["price"],
# Don't remove the below comment, this can be important for debuggung # Don't remove the below comment, this can be important for debuggung
# x["side"], x["amount"], # x["side"], x["amount"],
) for x in orders] ) for x in orders]

20
tests/exchange/test_kraken.py
View File

@ -89,6 +89,7 @@ def test_get_balances_prod(default_conf, mocker):
'2ST': balance_item.copy(), '2ST': balance_item.copy(),
'3ST': balance_item.copy(), '3ST': balance_item.copy(),
'4ST': balance_item.copy(), '4ST': balance_item.copy(),
'EUR': balance_item.copy(),
}) })
kraken_open_orders = [{'symbol': '1ST/EUR', kraken_open_orders = [{'symbol': '1ST/EUR',
'type': 'limit', 'type': 'limit',
@ -123,21 +124,22 @@ def test_get_balances_prod(default_conf, mocker):
'remaining': 2.0, 'remaining': 2.0,
}, },
{'status': 'open', {'status': 'open',
'symbol': 'BTC/3ST', 'symbol': '3ST/EUR',
'type': 'limit', 'type': 'limit',
'side': 'buy', 'side': 'buy',
'price': 20, 'price': 0.02,
'cost': 0.0, 'cost': 0.0,
'amount': 3.0, 'amount': 100.0,
'filled': 0.0, 'filled': 0.0,
'average': 0.0, 'average': 0.0,
'remaining': 3.0, 'remaining': 100.0,
}] }]
api_mock.fetch_open_orders = MagicMock(return_value=kraken_open_orders) api_mock.fetch_open_orders = MagicMock(return_value=kraken_open_orders)
default_conf['dry_run'] = False default_conf['dry_run'] = False
exchange = get_patched_exchange(mocker, default_conf, api_mock, id="kraken") exchange = get_patched_exchange(mocker, default_conf, api_mock, id="kraken")
balances = exchange.get_balances() balances = exchange.get_balances()
assert len(balances) == 4 assert len(balances) == 5
assert balances['1ST']['free'] == 9.0 assert balances['1ST']['free'] == 9.0
assert balances['1ST']['total'] == 10.0 assert balances['1ST']['total'] == 10.0
assert balances['1ST']['used'] == 1.0 assert balances['1ST']['used'] == 1.0
@ -146,13 +148,17 @@ def test_get_balances_prod(default_conf, mocker):
assert balances['2ST']['total'] == 10.0 assert balances['2ST']['total'] == 10.0
assert balances['2ST']['used'] == 4.0 assert balances['2ST']['used'] == 4.0
assert balances['3ST']['free'] == 7.0 assert balances['3ST']['free'] == 10.0
assert balances['3ST']['total'] == 10.0 assert balances['3ST']['total'] == 10.0
assert balances['3ST']['used'] == 3.0 assert balances['3ST']['used'] == 0.0
assert balances['4ST']['free'] == 10.0 assert balances['4ST']['free'] == 10.0
assert balances['4ST']['total'] == 10.0 assert balances['4ST']['total'] == 10.0
assert balances['4ST']['used'] == 0.0 assert balances['4ST']['used'] == 0.0
assert balances['EUR']['free'] == 8.0
assert balances['EUR']['total'] == 10.0
assert balances['EUR']['used'] == 2.0
ccxt_exceptionhandlers(mocker, default_conf, api_mock, "kraken", ccxt_exceptionhandlers(mocker, default_conf, api_mock, "kraken",
"get_balances", "fetch_balance") "get_balances", "fetch_balance")