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

checked average_price

Browse Source
This commit is contained in:
மனோஜ்குமார் பழனிச்சாமி 2022-04-03 18:03:04 +05:30
parent d038a1865b
commit a3c579c3d2
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freqtrade/exchange/exchange.py
View File

@ -927,7 +927,7 @@ class Exchange:
average_price, filled_amount = self._fill_dry_limit_order( average_price, filled_amount = self._fill_dry_limit_order(
pair, order['side'], order['price'], order['remaining']) pair, order['side'], order['price'], order['remaining'])
if filled_amount: if average_price:
order['remaining'] -= filled_amount order['remaining'] -= filled_amount
order_cost = order['average'] * order['filled'] + average_price * filled_amount order_cost = order['average'] * order['filled'] + average_price * filled_amount
order['filled'] += filled_amount order['filled'] += filled_amount

3
tests/rpc/test_rpc.py
View File

@ -825,7 +825,8 @@ def test_rpc_forceexit(default_conf, ticker, fee, mocker) -> None:
freqtradebot.state = State.RUNNING freqtradebot.state = State.RUNNING
assert cancel_order_mock.call_count == 0 assert cancel_order_mock.call_count == 0
mocker.patch( mocker.patch(
'freqtrade.exchange.Exchange._fill_dry_limit_order', MagicMock(side_effect=lambda *_: (None, 0)),) 'freqtrade.exchange.Exchange._fill_dry_limit_order',
MagicMock(side_effect=lambda *_: (None, 0)),)
freqtradebot.enter_positions() freqtradebot.enter_positions()
# make an limit-buy open trade # make an limit-buy open trade
trade = Trade.query.filter(Trade.id == '3').first() trade = Trade.query.filter(Trade.id == '3').first()

6
tests/test_freqtradebot.py
View File

@ -3392,7 +3392,8 @@ def test_execute_trade_exit_with_stoploss_on_exchange(
price_to_precision=lambda s, x, y: y, price_to_precision=lambda s, x, y: y,
stoploss=stoploss, stoploss=stoploss,
cancel_stoploss_order=cancel_order, cancel_stoploss_order=cancel_order,
_fill_dry_limit_order=MagicMock(side_effect=SideEffect(lambda *_: _[-2:], lambda *_: (None, 0))), _fill_dry_limit_order=MagicMock(
side_effect=SideEffect(lambda *_: _[-2:], lambda *_: (None, 0))),
) )
freqtrade = FreqtradeBot(default_conf_usdt) freqtrade = FreqtradeBot(default_conf_usdt)
@ -3441,7 +3442,8 @@ def test_may_execute_trade_exit_after_stoploss_on_exchange_hit(
get_fee=fee, get_fee=fee,
amount_to_precision=lambda s, x, y: y, amount_to_precision=lambda s, x, y: y,
price_to_precision=lambda s, x, y: y, price_to_precision=lambda s, x, y: y,
_fill_dry_limit_order=MagicMock(side_effect=SideEffect(lambda *_: (None, 0), lambda *_: _[-2:])), _fill_dry_limit_order=MagicMock(
side_effect=SideEffect(lambda *_: (None, 0), lambda *_: _[-2:])),
) )
stoploss = MagicMock(return_value={ stoploss = MagicMock(return_value={