Merge remote-tracking branch 'origin/develop' into pr/mkavinkumar1/6545

freqtrade/exchange/bybit.py

@@ -29,3 +29,17 @@ class Bybit(Exchange):
         # (TradingMode.FUTURES, MarginMode.CROSS),
         # (TradingMode.FUTURES, MarginMode.ISOLATED)
     ]
+
+    @property
+    def _ccxt_config(self) -> Dict:
+        # Parameters to add directly to ccxt sync/async initialization.
+        # ccxt defaults to swap mode.
+        config = {}
+        if self.trading_mode == TradingMode.SPOT:
+            config.update({
+                "options": {
+                    "defaultType": "spot"
+                }
+            })
+        config.update(super()._ccxt_config)
+        return config

tests/exchange/test_exchange.py

@@ -3902,6 +3902,7 @@ def test_validate_trading_mode_and_margin_mode(
     ("bibox", "spot", {"has": {"fetchCurrencies": False}}),
     ("bibox", "margin", {"has": {"fetchCurrencies": False}, "options": {"defaultType": "margin"}}),
     ("bibox", "futures", {"has": {"fetchCurrencies": False}, "options": {"defaultType": "swap"}}),
+    ("bybit", "spot", {"options": {"defaultType": "spot"}}),
     ("bybit", "futures", {"options": {"defaultType": "linear"}}),
     ("ftx", "futures", {"options": {"defaultType": "swap"}}),
     ("gateio", "futures", {"options": {"defaultType": "swap"}}),

tests/strategy/strats/strategy_test_v2.py

@@ -1,13 +1,9 @@
 # pragma pylint: disable=missing-docstring, invalid-name, pointless-string-statement
 
-from datetime import datetime
-from typing import Optional
-
 import talib.abstract as ta
 from pandas import DataFrame
 
 import freqtrade.vendor.qtpylib.indicators as qtpylib
-from freqtrade.persistence import Trade
 from freqtrade.strategy import IStrategy
 
 
@@ -150,13 +146,3 @@ class StrategyTestV2(IStrategy):
             ),
             'sell'] = 1
         return dataframe
-
-    def adjust_trade_position(self, trade: Trade, current_time: datetime, current_rate: float,
-                              current_profit: float,
-                              min_stake: Optional[float], max_stake: float, **kwargs):
-
-        if current_profit < -0.0075:
-            orders = trade.select_filled_orders('buy')
-            return round(orders[0].cost, 0)
-
-        return None