Merge branch 'develop' into ignore_expired_candle

tests/conftest_trades.py

@@ -32,6 +32,7 @@ def mock_trade_1(fee):
         exchange='bittrex',
         open_order_id='dry_run_buy_12345',
         strategy='DefaultStrategy',
+        timeframe=5,
     )
     o = Order.parse_from_ccxt_object(mock_order_1(), 'ETH/BTC', 'buy')
     trade.orders.append(o)
@@ -84,6 +85,7 @@ def mock_trade_2(fee):
         is_open=False,
         open_order_id='dry_run_sell_12345',
         strategy='DefaultStrategy',
+        timeframe=5,
         sell_reason='sell_signal',
         open_date=datetime.now(tz=timezone.utc) - timedelta(minutes=20),
         close_date=datetime.now(tz=timezone.utc),
@@ -132,6 +134,7 @@ def mock_trade_3(fee):
         pair='XRP/BTC',
         stake_amount=0.001,
         amount=123.0,
+        amount_requested=123.0,
         fee_open=fee.return_value,
         fee_close=fee.return_value,
         open_rate=0.05,
@@ -139,6 +142,8 @@ def mock_trade_3(fee):
         close_profit=0.01,
         exchange='bittrex',
         is_open=False,
+        strategy='DefaultStrategy',
+        timeframe=5,
         sell_reason='roi',
         open_date=datetime.now(tz=timezone.utc) - timedelta(minutes=20),
         close_date=datetime.now(tz=timezone.utc),
@@ -179,6 +184,7 @@ def mock_trade_4(fee):
         exchange='bittrex',
         open_order_id='prod_buy_12345',
         strategy='DefaultStrategy',
+        timeframe=5,
     )
     o = Order.parse_from_ccxt_object(mock_order_4(), 'ETC/BTC', 'buy')
     trade.orders.append(o)

tests/data/test_btanalysis.py

@@ -128,7 +128,7 @@ def test_load_trades_from_db(default_conf, fee, mocker):
         if col not in ['index', 'open_at_end']:
             assert col in trades.columns
     trades = load_trades_from_db(db_url=default_conf['db_url'], strategy='DefaultStrategy')
-    assert len(trades) == 3
+    assert len(trades) == 4
     trades = load_trades_from_db(db_url=default_conf['db_url'], strategy='NoneStrategy')
     assert len(trades) == 0
 

tests/optimize/test_hyperoptloss.py

@@ -20,7 +20,7 @@ def test_hyperoptlossresolver(mocker, default_conf) -> None:
     hl = ShortTradeDurHyperOptLoss
     mocker.patch(
         'freqtrade.resolvers.hyperopt_resolver.HyperOptLossResolver.load_object',
-        MagicMock(return_value=hl)
+        MagicMock(return_value=hl())
     )
     default_conf.update({'hyperopt_loss': 'SharpeHyperOptLossDaily'})
     x = HyperOptLossResolver.load_hyperoptloss(default_conf)

tests/rpc/test_rpc_manager.py

@@ -160,7 +160,7 @@ def test_startupmessages_telegram_enabled(mocker, default_conf, caplog) -> None:
 def test_init_apiserver_disabled(mocker, default_conf, caplog) -> None:
     caplog.set_level(logging.DEBUG)
     run_mock = MagicMock()
-    mocker.patch('freqtrade.rpc.api_server.ApiServer.run', run_mock)
+    mocker.patch('freqtrade.rpc.api_server.ApiServer.start_api', run_mock)
     default_conf['telegram']['enabled'] = False
     rpc_manager = RPCManager(get_patched_freqtradebot(mocker, default_conf))
 
@@ -172,7 +172,7 @@ def test_init_apiserver_disabled(mocker, default_conf, caplog) -> None:
 def test_init_apiserver_enabled(mocker, default_conf, caplog) -> None:
     caplog.set_level(logging.DEBUG)
     run_mock = MagicMock()
-    mocker.patch('freqtrade.rpc.api_server.ApiServer.run', run_mock)
+    mocker.patch('freqtrade.rpc.api_server.ApiServer.start_api', run_mock)
 
     default_conf["telegram"]["enabled"] = False
     default_conf["api_server"] = {"enabled": True,