OctoBot-Trading 2.4.48__tar.gz → 2.4.50__tar.gz

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50}/CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.4.50] - 2023-01-18
+### Updated
+- [Websocket] Fix websocket reconnection after binance auto disconect
+
+## [2.4.49] - 2023-01-08
+### Updated
+- [Exchanges] replace Huobi by HTX
+- [CCXT] 4.2.10
+
 ## [2.4.48] - 2023-12-15
 ### Fixed
 - [Orders] futures orders quantity parsing

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50/OctoBot_Trading.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OctoBot-Trading
-Version: 2.4.48
+Version: 2.4.50
 Summary: OctoBot project trading package
 Home-page: https://github.com/Drakkar-Software/OctoBot-Trading
 Author: Drakkar-Software
@@ -16,7 +16,7 @@ Classifier: Operating System :: POSIX
 Requires-Python: >=3.8
 License-File: LICENSE
 
-# OctoBot-Trading [2.4.48](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.50](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/903b6b22bceb4661b608a86fea655f69)](https://app.codacy.com/gh/Drakkar-Software/OctoBot-Trading?utm_source=github.com&utm_medium=referral&utm_content=Drakkar-Software/OctoBot-Trading&utm_campaign=Badge_Grade_Dashboard)
 [![PyPI](https://img.shields.io/pypi/v/OctoBot-Trading.svg)](https://pypi.python.org/pypi/OctoBot-Trading/)
 [![Coverage Status](https://coveralls.io/repos/github/Drakkar-Software/OctoBot-Trading/badge.svg?branch=master)](https://coveralls.io/github/Drakkar-Software/OctoBot-Trading?branch=master)

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50}/OctoBot_Trading.egg-info/SOURCES.txt

@@ -445,7 +445,6 @@ tests_additional/real_exchanges/test_bitget.py
 tests_additional/real_exchanges/test_bithumb.py
 tests_additional/real_exchanges/test_bitso.py
 tests_additional/real_exchanges/test_bitstamp.py
-tests_additional/real_exchanges/test_bittrex.py
 tests_additional/real_exchanges/test_bybit.py
 tests_additional/real_exchanges/test_bybit_futures.py
 tests_additional/real_exchanges/test_coinbase.py
@@ -454,7 +453,7 @@ tests_additional/real_exchanges/test_cryptocom.py
 tests_additional/real_exchanges/test_gateio.py
 tests_additional/real_exchanges/test_hitbtc.py
 tests_additional/real_exchanges/test_hollaex.py
-tests_additional/real_exchanges/test_huobi.py
+tests_additional/real_exchanges/test_htx.py
 tests_additional/real_exchanges/test_kraken.py
 tests_additional/real_exchanges/test_kucoin.py
 tests_additional/real_exchanges/test_kucoin_futures.py

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50}/OctoBot_Trading.egg-info/requires.txt

@@ -1,10 +1,10 @@
-numpy==1.24.3
+numpy==1.26.3
 OctoBot-Backtesting<1.10,>=1.9
 Async-Channel<2.3,>=2.2
 OctoBot-Commons<1.10,>=1.9
 OctoBot-Tentacles-Manager<2.10,>=2.9
 trading-backend>=1.2.7
-ccxt==4.1.82
+ccxt==4.2.10
 cryptography
 sortedcontainers==2.4.0
 tinydb==4.5.2

{OctoBot-Trading-2.4.48/OctoBot_Trading.egg-info → OctoBot-Trading-2.4.50}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OctoBot-Trading
-Version: 2.4.48
+Version: 2.4.50
 Summary: OctoBot project trading package
 Home-page: https://github.com/Drakkar-Software/OctoBot-Trading
 Author: Drakkar-Software
@@ -16,7 +16,7 @@ Classifier: Operating System :: POSIX
 Requires-Python: >=3.8
 License-File: LICENSE
 
-# OctoBot-Trading [2.4.48](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.50](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/903b6b22bceb4661b608a86fea655f69)](https://app.codacy.com/gh/Drakkar-Software/OctoBot-Trading?utm_source=github.com&utm_medium=referral&utm_content=Drakkar-Software/OctoBot-Trading&utm_campaign=Badge_Grade_Dashboard)
 [![PyPI](https://img.shields.io/pypi/v/OctoBot-Trading.svg)](https://pypi.python.org/pypi/OctoBot-Trading/)
 [![Coverage Status](https://coveralls.io/repos/github/Drakkar-Software/OctoBot-Trading/badge.svg?branch=master)](https://coveralls.io/github/Drakkar-Software/OctoBot-Trading?branch=master)

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50}/README.md

@@ -1,4 +1,4 @@
-# OctoBot-Trading [2.4.48](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.50](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/903b6b22bceb4661b608a86fea655f69)](https://app.codacy.com/gh/Drakkar-Software/OctoBot-Trading?utm_source=github.com&utm_medium=referral&utm_content=Drakkar-Software/OctoBot-Trading&utm_campaign=Badge_Grade_Dashboard)
 [![PyPI](https://img.shields.io/pypi/v/OctoBot-Trading.svg)](https://pypi.python.org/pypi/OctoBot-Trading/)
 [![Coverage Status](https://coveralls.io/repos/github/Drakkar-Software/OctoBot-Trading/badge.svg?branch=master)](https://coveralls.io/github/Drakkar-Software/OctoBot-Trading?branch=master)

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50}/octobot_trading/__init__.py

@@ -15,4 +15,4 @@
 #  License along with this library.
 
 PROJECT_NAME = "OctoBot-Trading"
-VERSION = "2.4.48"  # major.minor.revision
+VERSION = "2.4.50"  # major.minor.revision

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50}/octobot_trading/constants.py

@@ -82,10 +82,9 @@ FULL_CANDLE_HISTORY_EXCHANGES = [
     "bitfinex2",
     "bitstamp",
     "bybit",
-    "gateio",
     "bingx",
     "hollaex",
-    "huobi",
+    "htx",
     "kucoin",
     "okcoin",
     "okx",
@@ -97,7 +96,7 @@ TESTED_EXCHANGES = [
     "binance",
     "okx",
     "gateio",
-    "huobi",
+    "htx",
     "bitget",
     "ascendex",
     "kucoin",

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50}/octobot_trading/exchange_data/ohlcv/channel/ohlcv_updater.py

@@ -135,6 +135,9 @@ class OHLCVUpdater(ohlcv_channel.OHLCVProducer):
         self._set_initialized(pair, time_frame, False)
         # fetch history
         candles = None
+        if self.channel.exchange_manager.exchange_config is None:
+            # exchange stopped
+            return None
         try:
             candles: list = await self._get_init_candles(time_frame, pair)
         except errors.FailedRequest as e:

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50}/octobot_trading/exchanges/connectors/ccxt/ccxt_adapter.py

@@ -66,6 +66,18 @@ class CCXTAdapter(adapters.AbstractAdapter):
         except (KeyError, TypeError):
             pass
 
+    def _ensure_fees(self, order_or_trade):
+        # call if necessary
+        if order_or_trade.get(enums.ExchangeConstantsOrderColumns.FEE.value) is None:
+            order_or_trade[enums.ExchangeConstantsOrderColumns.FEE.value] = {
+                enums.FeePropertyColumns.COST.value: constants.ZERO,
+                enums.FeePropertyColumns.EXCHANGE_ORIGINAL_COST.value: constants.ZERO,
+                enums.FeePropertyColumns.CURRENCY.value: None,
+                enums.FeePropertyColumns.RATE.value: None,
+                enums.FeePropertyColumns.TYPE.value: ccxt_enums.ExchangeOrderCCXTColumns.TAKER_OR_MAKER.value,
+                enums.FeePropertyColumns.IS_FROM_EXCHANGE.value: True,
+            }
+
     def _fix_ohlcv_prices(self, ohlcv):
         for index, value in enumerate(ohlcv[common_enums.PriceIndexes.IND_PRICE_TIME.value + 1:]):
             ohlcv[index + 1] = float(value)

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50}/octobot_trading/exchanges/connectors/ccxt/ccxt_connector.py

@@ -101,7 +101,7 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
             self.time_frames = self.get_client_time_frames()
 
         except (ccxt.ExchangeNotAvailable, ccxt.RequestTimeout) as e:
-            raise octobot_trading.errors.UnreachableExchange() from e
+            raise octobot_trading.errors.UnreachableExchange(e) from e
         except ccxt.AuthenticationError:
             raise ccxt.AuthenticationError
 
@@ -347,10 +347,10 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
                 pass
             except ccxt.NotSupported as e:
                 # some exchanges are throwing this error when an order is cancelled (ex: coinbase pro)
-                raise octobot_trading.errors.NotSupported from e
+                raise octobot_trading.errors.NotSupported(e) from e
             except ccxt.ExchangeError as e:
                 # something went wrong and ccxt did not expect it
-                raise octobot_trading.errors.FailedRequest from e
+                raise octobot_trading.errors.FailedRequest(e) from e
         else:
             # When fetch_order is not supported, uses get_open_orders and extract order id
             open_orders = await self.get_open_orders(symbol=symbol)
@@ -391,7 +391,7 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
                 )
         except ccxt.NotSupported as e:
             # fetch_closed_orders is not supported
-            raise octobot_trading.errors.NotSupported from e
+            raise octobot_trading.errors.NotSupported(e) from e
 
     async def get_my_recent_trades(self, symbol: str = None, since: int = None,
                                    limit: int = None, **kwargs: dict) -> list:
@@ -543,9 +543,9 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
                 return enums.OrderStatus.CANCELED
         except ccxt.OrderNotFound as e:
             self.logger.debug(f"Trying to cancel order with id {exchange_order_id} but order was not found")
-            raise octobot_trading.errors.OrderCancelError from e
+            raise octobot_trading.errors.OrderCancelError(e) from e
         except (ccxt.NotSupported, octobot_trading.errors.NotSupported) as e:
-            raise octobot_trading.errors.NotSupported from e
+            raise octobot_trading.errors.NotSupported(e) from e
         except Exception as e:
             self.logger.exception(e, True, f"Unexpected error when cancelling order with exchange id: "
                                            f"{exchange_order_id} failed to cancel | {e} ({e.__class__.__name__})")
@@ -817,6 +817,6 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
             # use 2 index to get the caller of the context manager
             caller_function_name = inspect.stack()[2].function
             exchanges.log_time_sync_error(self.logger, self.name, err, caller_function_name)
-            raise octobot_trading.errors.FailedRequest from err
+            raise octobot_trading.errors.FailedRequest(err) from err
         except ccxt.RequestTimeout as e:
             raise octobot_trading.errors.FailedRequest(f"Request timeout: {e}") from e

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50}/octobot_trading/exchanges/connectors/ccxt/ccxt_websocket_connector.py

@@ -536,13 +536,18 @@ class CCXTWebsocketConnector(abstract_websocket_exchange.AbstractWebsocketExchan
         ws_des = f"{watch_func.__name__} {g_kwargs}"
         subsequent_disconnections = 0
         already_got_feed_stopping_error = False
+        already_got_closed_by_user_error = False
         spamming_logs_warning_interval = 5000
         spamming_logs_debug_interval = 1000
         while not self.should_stop:
             try:
                 update_data = await watch_func(*g_args, **g_kwargs)
+
                 self._last_message_time = time.time()
+                if subsequent_disconnections > 0:
+                    self.logger.debug(f"Reconnected to {ws_des}")
                 subsequent_disconnections = 0
+                already_got_closed_by_user_error = False
                 if update_data:
                     # Use a copy of the update data as it will be edited by adapters.
                     # We should avoid editing the original object since it is also used in ccxt internally buffers
@@ -600,15 +605,34 @@ class CCXTWebsocketConnector(abstract_websocket_exchange.AbstractWebsocketExchan
                 )
                 return
             except Exception as err:
-                error_count = self._increment_error_counter(g_kwargs.get("time_frame"), err)
-                error_message = f"Unexpected error when handling {ws_des} feed: {err} ({err.__class__.__name__}) " \
-                                f"({error_count} times)"
-                if error_count == 1:
-                    self.logger.exception(err, True, error_message)
-                elif error_count % spamming_logs_warning_interval == 0:
-                    self.logger.warning(error_message)
-                elif error_count % spamming_logs_debug_interval == 0:
-                    self.logger.debug(error_message)
+                count_error = True
+                if isinstance(err, ccxt.ExchangeClosedByUser):
+                    if self.should_stop:
+                        # normal when stopping websocket
+                        self.logger.debug(
+                            f"Disconnected {ws_des}: connection closed as {self.get_name()} is stopping ({err})"
+                        )
+                        return
+                    # happening when auto-stopping websocket (calling self._close_exchange_to_force_reconnect)
+                    # from another task: current task also raised ccxt.ExchangeClosedByUser
+                    # this is normal as long as it happens only once after a reconnection
+                    if not already_got_closed_by_user_error:
+                        count_error = False
+                        self.logger.debug(
+                            f"{ws_des} connection automatically closed, reconnecting in {self.LONG_RECONNECT_DELAY} "
+                            f"seconds ({err})"
+                        )
+                        already_got_closed_by_user_error = True
+                if count_error:
+                    error_count = self._increment_error_counter(g_kwargs.get("time_frame"), err)
+                    error_message = f"Unexpected error when handling {ws_des} feed: {err} ({err.__class__.__name__}) " \
+                                    f"({error_count} times)"
+                    if error_count == 1:
+                        self.logger.exception(err, True, error_message)
+                    elif error_count % spamming_logs_warning_interval == 0:
+                        self.logger.warning(error_message)
+                    elif error_count % spamming_logs_debug_interval == 0:
+                        self.logger.debug(error_message)
                 await asyncio.sleep(self.LONG_RECONNECT_DELAY)  # avoid spamming
                 subsequent_disconnections += 1  # wait for a longer time before the next reconnect
                 # self.client might have changed

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50}/octobot_trading/exchanges/types/rest_exchange.py

@@ -548,7 +548,11 @@ class RestExchange(abstract_exchange.AbstractExchange):
     async def _ensure_order_completeness(
         self, raw_order, symbol, since=None, limit=None, trades_by_exchange_order_id=None, **kwargs
     ):
-        if not self.REQUIRE_ORDER_FEES_FROM_TRADES or not exchanges_util.is_missing_trading_fees(raw_order):
+        if (
+            raw_order is None
+            or not self.REQUIRE_ORDER_FEES_FROM_TRADES
+            or not exchanges_util.is_missing_trading_fees(raw_order)
+        ):
             return raw_order
         trades_by_exchange_order_id = trades_by_exchange_order_id or await self._get_trades_by_exchange_order_id(
             symbol=symbol, since=since, limit=limit, **kwargs

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50}/octobot_trading/exchanges/util/exchange_util.py

@@ -156,7 +156,7 @@ def _get_docs_url():
         import octobot.constants
         return octobot.constants.OCTOBOT_DOCS_URL
     except ImportError:
-        return "https://www.octobot.cloud/guides"
+        return "https://www.octobot.cloud/en/guides"
 
 
 def _get_exchanges_docs_url():
@@ -164,7 +164,7 @@ def _get_exchanges_docs_url():
         import octobot.constants
         return octobot.constants.EXCHANGES_DOCS_URL
     except ImportError:
-        return "https://www.octobot.cloud/guides/exchanges"
+        return "https://www.octobot.cloud/en/guides/exchanges"
 
 
 def _get_time_sync_error_message(exchange_name, caller_name):

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50}/octobot_trading/modes/mode_config.py

@@ -100,7 +100,8 @@ def get_order_amount_value_desc():
            f"holdings associated to the current traded symbol; " \
         f"5{dsl.QuantityType.TRADED_SYMBOLS_ASSETS_PERCENT.value} to trade 5% of the available " \
            f"holdings associated to all configured trading pairs. " \
-        f"Leave empty to auto-compute the amount."
+        f"Leave empty to auto-compute the amount. Checkout the order amounts syntax from trading modes guides " \
+        f"for more details."
 
 
 def user_select_order_amount(trading_mode, inputs: dict, include_buy=True, include_sell=True,
@@ -108,7 +109,7 @@ def user_select_order_amount(trading_mode, inputs: dict, include_buy=True, inclu
     if include_buy:
         trading_mode.UI.user_input(
             constants.CONFIG_BUY_ORDER_AMOUNT, common_enums.UserInputTypes.TEXT, "", inputs,
-            title=_get_order_amount_title("buy"),
+            title=_get_order_amount_title("buy/entry"),
             other_schema_values={"minLength": 0},
             editor_options={
                 common_enums.UserInputOtherSchemaValuesTypes.DEPENDENCIES.value: buy_dependencies
@@ -117,7 +118,7 @@ def user_select_order_amount(trading_mode, inputs: dict, include_buy=True, inclu
     if include_sell:
         trading_mode.UI.user_input(
             constants.CONFIG_SELL_ORDER_AMOUNT, common_enums.UserInputTypes.TEXT, "", inputs,
-            title=_get_order_amount_title("sell"),
+            title=_get_order_amount_title("sell/exit"),
             other_schema_values={"minLength": 0},
             editor_options={
                 common_enums.UserInputOtherSchemaValuesTypes.DEPENDENCIES.value: sell_dependencies

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50}/requirements.txt

@@ -1,4 +1,4 @@
-numpy==1.24.3
+numpy==1.26.3
 
 # Drakkar-Software requirements
 OctoBot-Backtesting>=1.9, <1.10
@@ -8,7 +8,7 @@ OctoBot-Tentacles-Manager>=2.9, <2.10
 trading-backend>=1.2.7
 
 # Exchange connection requirements
-ccxt==4.1.82 # always ensure real exchanges tests (in tests_additional and authenticated exchange tests) are passing before changing the ccxt version
+ccxt==4.2.10 # always ensure real exchanges tests (in tests_additional and authenticated exchange tests) are passing before changing the ccxt version
 
 cryptography # Never specify a version (managed by https://github.com/Drakkar-Software/OctoBot-PyPi-Linux-Deployer)
 

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50}/tests/exchanges/util/test_exchange_util.py

@@ -80,7 +80,7 @@ async def test_is_compatible_account_with_checked_exchange(exchange_config, tent
 
 
 def test_get_partners_explanation_message():
-    assert ".cloud/guides" in exchanges.get_partners_explanation_message()
+    assert ".cloud/en/guides" in exchanges.get_partners_explanation_message()
 
 
 def test_log_time_sync_error():
@@ -90,7 +90,7 @@ def test_log_time_sync_error():
     assert "exchange_name".capitalize() in args
     assert "error" in args
     assert "hello call" in args
-    assert ".cloud/guides" in args
+    assert ".cloud/en/guides" in args
 
 
 @pytest.mark.asyncio

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50}/tests_additional/real_exchanges/test_bitfinex.py

@@ -184,6 +184,6 @@ class TestBitfinexRealExchangeTester(RealExchangeTester):
             assert ticker[Ectc.LAST.value]
             assert ticker[Ectc.PREVIOUS_CLOSE.value] is None
             assert ticker[Ectc.BASE_VOLUME.value]
-            assert ticker[Ectc.TIMESTAMP.value]
+            assert ticker[Ectc.TIMESTAMP.value] is None  # will trigger an 'Ignored incomplete ticker'
             # open is None on this exchange
-            RealExchangeTester.check_ticker_typing(ticker)
+            RealExchangeTester.check_ticker_typing(ticker, check_timestamp=False)

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50}/tests_additional/real_exchanges/test_bitget.py

@@ -20,6 +20,7 @@ from octobot_trading.enums import ExchangeConstantsMarketStatusColumns as Ecmsc,
     ExchangeConstantsOrderBookInfoColumns as Ecobic, ExchangeConstantsOrderColumns as Ecoc, \
     ExchangeConstantsTickersColumns as Ectc
 from tests_additional.real_exchanges.real_exchange_tester import RealExchangeTester
+import octobot_trading.errors as errors
 from tests_additional.real_exchanges import get_exchange_manager
 # required to catch async loop context exceptions
 from tests import event_loop
@@ -80,7 +81,7 @@ class TestBitgetRealExchangeTester(RealExchangeTester):
     async def test_get_symbol_prices(self):
         # without limit
         symbol_prices = await self.get_symbol_prices()
-        assert len(symbol_prices) == 200
+        assert len(symbol_prices) == 100
         # check candles order (oldest first)
         self.ensure_elements_order(symbol_prices, PriceIndexes.IND_PRICE_TIME.value)
         # check last candle is the current candle
@@ -99,9 +100,12 @@ class TestBitgetRealExchangeTester(RealExchangeTester):
     async def test_get_historical_symbol_prices(self):
         # try with since and limit (used in data collector)
         for limit in (50, None):
-            assert await self.get_symbol_prices(since=self.CANDLE_SINCE, limit=limit) == []
-            # with now time as until: does not give historical candles
-            symbol_prices = await self.get_symbol_prices(since=self.CANDLE_SINCE, limit=limit, until=self.get_ms_time())
+            if limit is None:
+                with pytest.raises(errors.FailedRequest):
+                    # not supported
+                    await self.get_symbol_prices(since=self.CANDLE_SINCE, limit=limit)
+                continue
+            symbol_prices = await self.get_symbol_prices(since=self.CANDLE_SINCE, limit=limit)
             if limit:
                 assert len(symbol_prices) == limit
             else:
@@ -111,9 +115,11 @@ class TestBitgetRealExchangeTester(RealExchangeTester):
             # check that fetched candles are historical candles
             max_candle_time = self.get_time_after_time_frames(self.CANDLE_SINCE_SEC, len(symbol_prices))
             assert max_candle_time <= self.get_time()
-            with pytest.raises(AssertionError):  # not supported
-                for candle in symbol_prices:
-                    assert self.CANDLE_SINCE_SEC <= candle[PriceIndexes.IND_PRICE_TIME.value] <= max_candle_time
+            for candle in symbol_prices:
+                assert self.CANDLE_SINCE_SEC <= candle[PriceIndexes.IND_PRICE_TIME.value]
+
+                # invalid (since param not respected)
+                assert candle[PriceIndexes.IND_PRICE_TIME.value] > max_candle_time
 
     async def test_get_kline_price(self):
         kline_price = await self.get_kline_price()

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50}/tests_additional/real_exchanges/test_cryptocom.py

@@ -114,9 +114,9 @@ class TestCryptoComRealExchangeTester(RealExchangeTester):
     async def test_get_order_book(self):
         order_book = await self.get_order_book()
         assert len(order_book[Ecobic.ASKS.value]) == 5
-        assert len(order_book[Ecobic.ASKS.value][0]) == 2
+        assert len(order_book[Ecobic.ASKS.value][0]) == 3
         assert len(order_book[Ecobic.BIDS.value]) == 5
-        assert len(order_book[Ecobic.BIDS.value][0]) == 2
+        assert len(order_book[Ecobic.BIDS.value][0]) == 3
 
     async def test_get_recent_trades(self):
         recent_trades = await self.get_recent_trades()

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50}/tests_additional/real_exchanges/test_gateio.py

@@ -84,18 +84,21 @@ class TestGateIORealExchangeTester(RealExchangeTester):
     async def test_get_historical_symbol_prices(self):
         # try with since and limit (used in data collector)
         for limit in (50, None):
-            symbol_prices = await self.get_symbol_prices(since=self.CANDLE_SINCE, limit=limit)
-            if limit:
-                assert len(symbol_prices) == limit
-            else:
-                assert len(symbol_prices) > 5
-            # check candles order (oldest first)
-            self.ensure_elements_order(symbol_prices, PriceIndexes.IND_PRICE_TIME.value)
-            # check that fetched candles are historical candles
-            max_candle_time = self.get_time_after_time_frames(self.CANDLE_SINCE_SEC, len(symbol_prices))
-            assert max_candle_time <= self.get_time()
-            for candle in symbol_prices:
-                assert self.CANDLE_SINCE_SEC <= candle[PriceIndexes.IND_PRICE_TIME.value] <= max_candle_time
+            with pytest.raises(errors.FailedRequest):
+                await self.get_symbol_prices(since=self.CANDLE_SINCE, limit=limit)
+            # not supported anymore (Candlestick too long ago. Maximum 10000 points ago are allowed)
+            # symbol_prices = await self.get_symbol_prices(since=self.CANDLE_SINCE, limit=limit)
+            # if limit:
+            #     assert len(symbol_prices) == limit
+            # else:
+            #     assert len(symbol_prices) > 5
+            # # check candles order (oldest first)
+            # self.ensure_elements_order(symbol_prices, PriceIndexes.IND_PRICE_TIME.value)
+            # # check that fetched candles are historical candles
+            # max_candle_time = self.get_time_after_time_frames(self.CANDLE_SINCE_SEC, len(symbol_prices))
+            # assert max_candle_time <= self.get_time()
+            # for candle in symbol_prices:
+            #     assert self.CANDLE_SINCE_SEC <= candle[PriceIndexes.IND_PRICE_TIME.value] <= max_candle_time
 
     async def test_get_kline_price(self):
         kline_price = await self.get_kline_price()

OctoBot-Trading-2.4.48/tests_additional/real_exchanges/test_huobi.py → OctoBot-Trading-2.4.50/tests_additional/real_exchanges/test_htx.py

@@ -28,8 +28,8 @@ from tests import event_loop
 pytestmark = pytest.mark.asyncio
 
 
-class TestHuobiRealExchangeTester(RealExchangeTester):
-    EXCHANGE_NAME = "huobi"
+class TestHTXRealExchangeTester(RealExchangeTester):
+    EXCHANGE_NAME = "htx"
     SYMBOL = "BTC/USDT"
     SYMBOL_2 = "ETH/BTC"
     SYMBOL_3 = "XRP/BTC"

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50}/tests_additional/real_exchanges/test_kraken.py

@@ -170,5 +170,5 @@ class TestKrakenRealExchangeTester(RealExchangeTester):
             assert ticker[Ectc.LAST.value]
             assert ticker[Ectc.PREVIOUS_CLOSE.value] is None
             assert ticker[Ectc.BASE_VOLUME.value]
-            assert ticker[Ectc.TIMESTAMP.value]
-            RealExchangeTester.check_ticker_typing(ticker)
+            assert ticker[Ectc.TIMESTAMP.value] is None  # will trigger an 'Ignored incomplete ticker'
+            RealExchangeTester.check_ticker_typing(ticker, check_timestamp=False)

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50}/tests_additional/real_exchanges/test_ndax.py

@@ -120,9 +120,9 @@ class TestNdaxRealExchangeTester(RealExchangeTester):
     async def test_get_order_book(self):
         order_book = await self.get_order_book()
         assert len(order_book[Ecobic.ASKS.value]) == 5
-        assert len(order_book[Ecobic.ASKS.value][0]) == 2
+        assert len(order_book[Ecobic.ASKS.value][0]) == 3
         assert len(order_book[Ecobic.BIDS.value]) == 5
-        assert len(order_book[Ecobic.BIDS.value][0]) == 2
+        assert len(order_book[Ecobic.BIDS.value][0]) == 3
 
     async def test_get_recent_trades(self):
         recent_trades = await self.get_recent_trades()

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50}/tests_additional/real_exchanges/test_okx.py

@@ -124,9 +124,9 @@ class TestOkxRealExchangeTester(RealExchangeTester):
     async def test_get_order_book(self):
         order_book = await self.get_order_book()
         assert len(order_book[Ecobic.ASKS.value]) == 5
-        assert len(order_book[Ecobic.ASKS.value][0]) == 2
+        assert len(order_book[Ecobic.ASKS.value][0]) == 3
         assert len(order_book[Ecobic.BIDS.value]) == 5
-        assert len(order_book[Ecobic.BIDS.value][0]) == 2
+        assert len(order_book[Ecobic.BIDS.value][0]) == 3
 
     async def test_get_recent_trades(self):
         recent_trades = await self.get_recent_trades()

{OctoBot-Trading-2.4.48 → OctoBot-Trading-2.4.50}/tests_additional/real_exchanges/test_okx_futures.py

@@ -123,9 +123,9 @@ class TestOkxFuturesRealExchangeTester(RealFuturesExchangeTester):
     async def test_get_order_book(self):
         order_book = await self.get_order_book()
         assert len(order_book[Ecobic.ASKS.value]) == 5
-        assert len(order_book[Ecobic.ASKS.value][0]) == 2
+        assert len(order_book[Ecobic.ASKS.value][0]) == 3
         assert len(order_book[Ecobic.BIDS.value]) == 5
-        assert len(order_book[Ecobic.BIDS.value][0]) == 2
+        assert len(order_book[Ecobic.BIDS.value][0]) == 3
 
     async def test_get_recent_trades(self):
         recent_trades = await self.get_recent_trades()