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

Rename get_liquidation method

Browse Source
This commit is contained in:
Matthias 2022-02-28 19:42:26 +01:00
parent 1d27cbd01f
commit ab46476e63
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freqtrade/exchange/exchange.py
View File

@ -2077,7 +2077,7 @@ class Exchange:
self.trading_mode == TradingMode.FUTURES self.trading_mode == TradingMode.FUTURES
): ):
wallet_balance = (amount * open_rate) / leverage wallet_balance = (amount * open_rate) / leverage
isolated_liq = self.get_liquidation_price( isolated_liq = self.get_or_calculate_liquidation_price(
pair=pair, pair=pair,
open_rate=open_rate, open_rate=open_rate,
is_short=is_short, is_short=is_short,

12
tests/exchange/test_exchange.py
View File

@ -3666,7 +3666,7 @@ def test_calculate_funding_fees(
) == kraken_fee ) == kraken_fee
def test_get_liquidation_price(mocker, default_conf): def test_get_or_calculate_liquidation_price(mocker, default_conf):
api_mock = MagicMock() api_mock = MagicMock()
positions = [ positions = [
@ -3705,7 +3705,7 @@ def test_get_liquidation_price(mocker, default_conf):
default_conf['liquidation_buffer'] = 0.0 default_conf['liquidation_buffer'] = 0.0
exchange = get_patched_exchange(mocker, default_conf, api_mock) exchange = get_patched_exchange(mocker, default_conf, api_mock)
liq_price = exchange.get_liquidation_price( liq_price = exchange.get_or_calculate_liquidation_price(
pair='NEAR/USDT:USDT', pair='NEAR/USDT:USDT',
open_rate=18.884, open_rate=18.884,
is_short=False, is_short=False,
@ -3716,7 +3716,7 @@ def test_get_liquidation_price(mocker, default_conf):
default_conf['liquidation_buffer'] = 0.05 default_conf['liquidation_buffer'] = 0.05
exchange = get_patched_exchange(mocker, default_conf, api_mock) exchange = get_patched_exchange(mocker, default_conf, api_mock)
liq_price = exchange.get_liquidation_price( liq_price = exchange.get_or_calculate_liquidation_price(
pair='NEAR/USDT:USDT', pair='NEAR/USDT:USDT',
open_rate=18.884, open_rate=18.884,
is_short=False, is_short=False,
@ -3730,7 +3730,7 @@ def test_get_liquidation_price(mocker, default_conf):
default_conf, default_conf,
api_mock, api_mock,
"binance", "binance",
"get_liquidation_price", "get_or_calculate_liquidation_price",
"fetch_positions", "fetch_positions",
pair="XRP/USDT", pair="XRP/USDT",
open_rate=0.0, open_rate=0.0,
@ -4088,7 +4088,7 @@ def test_liquidation_price_is_none(
default_conf['trading_mode'] = trading_mode default_conf['trading_mode'] = trading_mode
default_conf['margin_mode'] = margin_mode default_conf['margin_mode'] = margin_mode
exchange = get_patched_exchange(mocker, default_conf, id=exchange_name) exchange = get_patched_exchange(mocker, default_conf, id=exchange_name)
assert exchange.get_liquidation_price( assert exchange.get_or_calculate_liquidation_price(
pair='DOGE/USDT', pair='DOGE/USDT',
open_rate=open_rate, open_rate=open_rate,
is_short=is_short, is_short=is_short,
@ -4122,7 +4122,7 @@ def test_liquidation_price(
default_conf['liquidation_buffer'] = 0.0 default_conf['liquidation_buffer'] = 0.0
exchange = get_patched_exchange(mocker, default_conf, id=exchange_name) exchange = get_patched_exchange(mocker, default_conf, id=exchange_name)
exchange.get_maintenance_ratio_and_amt = MagicMock(return_value=(mm_ratio, maintenance_amt)) exchange.get_maintenance_ratio_and_amt = MagicMock(return_value=(mm_ratio, maintenance_amt))
assert isclose(round(exchange.get_liquidation_price( assert isclose(round(exchange.get_or_calculate_liquidation_price(
pair='DOGE/USDT', pair='DOGE/USDT',
open_rate=open_rate, open_rate=open_rate,
is_short=is_short, is_short=is_short,