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

Changes described on github

Browse Source
This commit is contained in:
Sam Germain 2021-10-11 04:14:59 -06:00
parent 855b26f846
commit d5a1385fdc
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freqtrade/freqtradebot.py
View File

@ -106,7 +106,7 @@ class FreqtradeBot(LoggingMixin):
LoggingMixin.__init__(self, logger, timeframe_to_seconds(self.strategy.timeframe)) LoggingMixin.__init__(self, logger, timeframe_to_seconds(self.strategy.timeframe))
if 'trading_mode' in self.config: if 'trading_mode' in self.config:
self.trading_mode = self.config['trading_mode'] self.trading_mode = TradingMode(self.config['trading_mode'])
else: else:
self.trading_mode = TradingMode.SPOT self.trading_mode = TradingMode.SPOT

20
tests/exchange/test_exchange.py
View File

@ -3053,36 +3053,36 @@ def test_get_funding_fees_from_exchange(default_conf, mocker, exchange_name):
api_mock = MagicMock() api_mock = MagicMock()
api_mock.fetch_funding_history = MagicMock(return_value=[ api_mock.fetch_funding_history = MagicMock(return_value=[
{ {
'amount': 0.14542341, 'amount': 0.14542,
'code': 'USDT', 'code': 'USDT',
'datetime': '2021-09-01T08:00:01.000Z', 'datetime': '2021-09-01T08:00:01.000Z',
'id': '485478', 'id': '485478',
'info': {'asset': 'USDT', 'info': {'asset': 'USDT',
'income': '0.14542341', 'income': '0.14542',
'incomeType': 'FUNDING_FEE', 'incomeType': 'FUNDING_FEE',
'info': 'FUNDING_FEE', 'info': 'FUNDING_FEE',
'symbol': 'XRPUSDT', 'symbol': 'XRPUSDT',
'time': '1630512001000', 'time': '1630382001000',
'tradeId': '', 'tradeId': '',
'tranId': '4854789484855218760'}, 'tranId': '993203'},
'symbol': 'XRP/USDT', 'symbol': 'XRP/USDT',
'timestamp': 1630512001000 'timestamp': 1630382001000
}, },
{ {
'amount': -0.14642341, 'amount': -0.14642,
'code': 'USDT', 'code': 'USDT',
'datetime': '2021-09-01T16:00:01.000Z', 'datetime': '2021-09-01T16:00:01.000Z',
'id': '485479', 'id': '485479',
'info': {'asset': 'USDT', 'info': {'asset': 'USDT',
'income': '-0.14642341', 'income': '-0.14642',
'incomeType': 'FUNDING_FEE', 'incomeType': 'FUNDING_FEE',
'info': 'FUNDING_FEE', 'info': 'FUNDING_FEE',
'symbol': 'XRPUSDT', 'symbol': 'XRPUSDT',
'time': '1630512001000', 'time': '1630314001000',
'tradeId': '', 'tradeId': '',
'tranId': '4854789484855218760'}, 'tranId': '993204'},
'symbol': 'XRP/USDT', 'symbol': 'XRP/USDT',
'timestamp': 1630512001000 'timestamp': 1630314001000
} }
]) ])
type(api_mock).has = PropertyMock(return_value={'fetchFundingHistory': True}) type(api_mock).has = PropertyMock(return_value={'fetchFundingHistory': True})