Merge branch 'develop' into feat/short
This commit is contained in:
@@ -17,7 +17,7 @@ from telegram import Chat, Message, Update
|
||||
from freqtrade import constants
|
||||
from freqtrade.commands import Arguments
|
||||
from freqtrade.data.converter import ohlcv_to_dataframe
|
||||
from freqtrade.edge import Edge, PairInfo
|
||||
from freqtrade.edge import PairInfo
|
||||
from freqtrade.enums import Collateral, RunMode, TradingMode
|
||||
from freqtrade.enums.signaltype import SignalDirection
|
||||
from freqtrade.exchange import Exchange
|
||||
@@ -163,11 +163,6 @@ def patch_edge(mocker) -> None:
|
||||
mocker.patch('freqtrade.edge.Edge.calculate', MagicMock(return_value=True))
|
||||
|
||||
|
||||
def get_patched_edge(mocker, config) -> Edge:
|
||||
patch_edge(mocker)
|
||||
edge = Edge(config)
|
||||
return edge
|
||||
|
||||
# Functions for recurrent object patching
|
||||
|
||||
|
||||
@@ -2370,6 +2365,46 @@ def market_buy_order_usdt():
|
||||
}
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def market_buy_order_usdt_doublefee(market_buy_order_usdt):
|
||||
order = deepcopy(market_buy_order_usdt)
|
||||
order['fee'] = None
|
||||
# Market orders filled with 2 trades can have fees in different currencies
|
||||
# assuming the account runs out of BNB.
|
||||
order['fees'] = [
|
||||
{'cost': 0.00025125, 'currency': 'BNB'},
|
||||
{'cost': 0.05030681, 'currency': 'USDT'},
|
||||
]
|
||||
order['trades'] = [{
|
||||
'timestamp': None,
|
||||
'datetime': None,
|
||||
'symbol': 'ETH/USDT',
|
||||
'id': None,
|
||||
'order': '123',
|
||||
'type': 'market',
|
||||
'side': 'sell',
|
||||
'takerOrMaker': None,
|
||||
'price': 2.01,
|
||||
'amount': 25.0,
|
||||
'cost': 50.25,
|
||||
'fee': {'cost': 0.00025125, 'currency': 'BNB'}
|
||||
}, {
|
||||
'timestamp': None,
|
||||
'datetime': None,
|
||||
'symbol': 'ETH/USDT',
|
||||
'id': None,
|
||||
'order': '123',
|
||||
'type': 'market',
|
||||
'side': 'sell',
|
||||
'takerOrMaker': None,
|
||||
'price': 2.0,
|
||||
'amount': 5,
|
||||
'cost': 10,
|
||||
'fee': {'cost': 0.0100306, 'currency': 'USDT'}
|
||||
}]
|
||||
return order
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def market_sell_order_usdt():
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user