OctoBot-Trading 2.4.76__tar.gz → 2.4.78__tar.gz

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/CHANGELOG.md

@@ -4,6 +4,16 @@ 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.78] - 2024-04-15
+### Added
+- [Exchanges] key adapter
+### Updated
+- CCXT to 4.2.95
+
+## [2.4.77] - 2024-04-13
+### Added
+- [Exchanges] Handle inactive markets
+
 ## [2.4.76] - 2024-04-12
 ### Added
 - [Exchanges] Handle order type open status for symbol

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78/OctoBot_Trading.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OctoBot-Trading
-Version: 2.4.76
+Version: 2.4.78
 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.76](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.78](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.76 → OctoBot-Trading-2.4.78}/OctoBot_Trading.egg-info/requires.txt

@@ -4,7 +4,7 @@ Async-Channel<2.3,>=2.2
 OctoBot-Commons<1.10,>=1.9.43
 OctoBot-Tentacles-Manager<2.10,>=2.9
 trading-backend>=1.2.7
-ccxt==4.2.77
+ccxt==4.2.95
 cryptography
 sortedcontainers==2.4.0
 tinydb==4.5.2

{OctoBot-Trading-2.4.76/OctoBot_Trading.egg-info → OctoBot-Trading-2.4.78}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OctoBot-Trading
-Version: 2.4.76
+Version: 2.4.78
 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.76](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.78](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.76 → OctoBot-Trading-2.4.78}/README.md

@@ -1,4 +1,4 @@
-# OctoBot-Trading [2.4.76](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.78](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.76 → OctoBot-Trading-2.4.78}/octobot_trading/__init__.py

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

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/octobot_trading/exchanges/connectors/ccxt/ccxt_client_util.py

@@ -27,9 +27,11 @@ import octobot_trading.exchanges.connectors.ccxt.ccxt_clients_cache as ccxt_clie
 import octobot_trading.exchanges.util.exchange_util as exchange_util
 
 
-def create_client(exchange_class, exchange_manager, logger,
-                  options, headers, additional_config, 
-                  should_authenticate, unauthenticated_exchange_fallback=None):
+def create_client(
+    exchange_class, exchange_manager, logger, options, headers,
+    additional_config, should_authenticate, unauthenticated_exchange_fallback=None,
+    keys_adapter=None
+):
     """
     Exchange instance creation
     :return: the created ccxt (pro, async or sync) client
@@ -43,6 +45,8 @@ def create_client(exchange_class, exchange_manager, logger,
     if exchange_manager.ignore_config or exchange_manager.check_config(exchange_manager.exchange_name):
         try:
             key, secret, password = exchange_manager.get_exchange_credentials(exchange_manager.exchange_name)
+            if keys_adapter:
+                key, secret, password = keys_adapter(key, secret, password)
             if not (key and secret) and not exchange_manager.is_simulated and not exchange_manager.ignore_config:
                 logger.warning(f"No exchange API key set for {exchange_manager.exchange_name}. "
                                f"Enter your account details to enable real trading on this exchange.")
@@ -134,8 +138,16 @@ def get_ccxt_client_login_options(exchange_manager):
     return {'defaultType': 'spot'}
 
 
-def get_symbols(client):
+def get_symbols(client, active_only):
     try:
+        if active_only:
+            return set(
+                symbol
+                for symbol in client.symbols
+                if client.markets.get(symbol, {}).get(
+                    enums.ExchangeConstantsMarketStatusColumns.ACTIVE.value, True
+                )
+            )
         return set(client.symbols)
     except (AttributeError, TypeError):
         # ccxt exchange load_markets failed

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/octobot_trading/exchanges/connectors/ccxt/ccxt_connector.py

@@ -97,7 +97,7 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
                 )
 
             # initialize symbols and timeframes
-            self.symbols = self.get_client_symbols()
+            self.symbols = self.get_client_symbols(active_only=True)
             self.time_frames = self.get_client_time_frames()
 
         except (ccxt.ExchangeNotAvailable, ccxt.RequestTimeout) as e:
@@ -157,8 +157,8 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
                 else:
                     raise
 
-    def get_client_symbols(self):
-        return ccxt_client_util.get_symbols(self.client)
+    def get_client_symbols(self, active_only=True):
+        return ccxt_client_util.get_symbols(self.client, active_only)
 
     def get_client_time_frames(self):
         return ccxt_client_util.get_time_frames(self.client)
@@ -204,11 +204,12 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
     def _create_client(self, force_unauth=False):
         self.client, self.is_authenticated = self._client_factory(force_unauth)
 
-    def _client_factory(self, force_unauth) -> tuple:
+    def _client_factory(self, force_unauth, keys_adapter=None) -> tuple:
         return ccxt_client_util.create_client(
             self.exchange_type, self.exchange_manager, self.logger,
             self.options, self.headers, self.additional_config,
-            False if force_unauth else self._should_authenticate(), self.unauthenticated_exchange_fallback
+            False if force_unauth else self._should_authenticate(), self.unauthenticated_exchange_fallback,
+            keys_adapter=keys_adapter
         )
 
     def _should_authenticate(self):
@@ -218,7 +219,9 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
         )
 
     def unauthenticated_exchange_fallback(self, err):
-        self.handle_token_error(err)
+        if not self.exchange_manager.exchange_only:
+            # don't log error when auth is probably not necessary
+            self.handle_token_error(err)
         return ccxt_client_util.get_unauthenticated_exchange(
             self.exchange_type,
             self.options, self.headers, self.additional_config

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/octobot_trading/exchanges/connectors/ccxt/ccxt_websocket_connector.py

@@ -766,7 +766,7 @@ class CCXTWebsocketConnector(abstract_websocket_exchange.AbstractWebsocketExchan
         return self.EXCHANGE_FEEDS.get(Feeds.CANDLE, Feeds.UNSUPPORTED.value) != Feeds.UNSUPPORTED.value
 
     def _is_supported_pair(self, pair):
-        return pair in ccxt_client_util.get_symbols(self.client)
+        return pair in ccxt_client_util.get_symbols(self.client, True)
 
     def _is_pair_independent_feed(self, feed):
         return feed in self.PAIR_INDEPENDENT_CHANNELS

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/octobot_trading/util/test_tools/exchanges_test_tools.py

@@ -124,13 +124,13 @@ async def ensure_symbol_markets(
         await exchange_manager.exchange.connector.load_symbol_markets(reload=reload, market_filter=market_filter)
 
 
-async def get_portfolio(exchange_manager, as_float=False) -> dict:
+async def get_portfolio(exchange_manager, as_float=False, clear_empty=True) -> dict:
     balance = await exchange_manager.exchange.get_balance()
     # filter out 0 values
     return {
         asset: {key: float(val) if as_float else val for key, val in values.items()}  # use float for values
         for asset, values in balance.items()
-        if any(value for value in values.values())
+        if not clear_empty or (clear_empty and any(value for value in values.values()))
     }
 
 

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/requirements.txt

@@ -8,7 +8,8 @@ OctoBot-Tentacles-Manager>=2.9, <2.10
 trading-backend>=1.2.7
 
 # Exchange connection requirements
-ccxt==4.2.77 # always ensure real exchanges tests (in tests_additional and authenticated exchange tests) are passing before changing the ccxt version
+# issue from 96, need ccxt==4.2.99
+ccxt==4.2.95 # 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.76 → OctoBot-Trading-2.4.78}/tests/exchanges/test_exchange_config_data.py

@@ -80,7 +80,6 @@ class TestExchangeConfig:
         }
         _, exchange_manager = await self.init_default(config=config)
 
-        assert "UNI/BTC" in exchange_manager.exchange_config.traded_cryptocurrencies["Bitcoin"]
         assert "AVAX/BTC" in exchange_manager.exchange_config.traded_cryptocurrencies["Bitcoin"]
         assert "ADA/BTC" in exchange_manager.exchange_config.traded_cryptocurrencies["Bitcoin"]
         assert "MATIC/BTC" in exchange_manager.exchange_config.traded_cryptocurrencies["Bitcoin"]
@@ -90,6 +89,9 @@ class TestExchangeConfig:
         assert "AVAX/BNB" not in exchange_manager.exchange_config.traded_cryptocurrencies["Bitcoin"]
         assert "ETH/BTC" in exchange_manager.exchange_config.traded_symbol_pairs
 
+        # inactive markets
+        assert "UNI/BTC" not in exchange_manager.exchange_config.traded_cryptocurrencies["Bitcoin"]
+
         # disabled
         assert "Ethereum" not in exchange_manager.exchange_config.traded_cryptocurrencies
         assert "ADA/ETH" not in exchange_manager.exchange_config.traded_symbol_pairs
@@ -113,10 +115,12 @@ class TestExchangeConfig:
         }
         _, exchange_manager = await self.init_default(config=config)
 
-        assert "TRX/BTC" in exchange_manager.exchange_config.traded_symbol_pairs
         assert "ADA/BTC" in exchange_manager.exchange_config.traded_symbol_pairs
         assert "Bitcoin" in exchange_manager.exchange_config.traded_cryptocurrencies
 
+        # inactive markets
+        assert "TRX/BTC" not in exchange_manager.exchange_config.traded_cryptocurrencies["Bitcoin"]
+
         # invalid ETH wildcard config
         assert "Ethereum" not in exchange_manager.exchange_config.traded_cryptocurrencies
 
@@ -141,7 +145,6 @@ class TestExchangeConfig:
 
         _, exchange_manager = await self.init_default(config=config)
 
-        assert "UNI/BTC" in exchange_manager.exchange_config.traded_cryptocurrencies["Bitcoin"]
         assert "AVAX/BTC" in exchange_manager.exchange_config.traded_cryptocurrencies["Bitcoin"]
         assert "ADA/BTC" in exchange_manager.exchange_config.traded_cryptocurrencies["Bitcoin"]
         assert "MATIC/BTC" in exchange_manager.exchange_config.traded_cryptocurrencies["Bitcoin"]
@@ -152,6 +155,9 @@ class TestExchangeConfig:
         assert "AVAX/BNB" not in exchange_manager.exchange_config.traded_cryptocurrencies["Bitcoin"]
         assert "BTC/USDT" in exchange_manager.exchange_config.traded_symbol_pairs
 
+        # inactive markets
+        assert "UNI/BTC" not in exchange_manager.exchange_config.traded_cryptocurrencies["Bitcoin"]
+
         # disabled
         assert "Ethereum" not in exchange_manager.exchange_config.traded_cryptocurrencies
         assert "ADA/ETH" not in exchange_manager.exchange_config.traded_symbol_pairs
@@ -189,11 +195,13 @@ class TestExchangeConfig:
         _, exchange_manager = await self.init_default(config=config)
 
         assert exchange_manager.exchange_config.traded_cryptocurrencies["Binance Coin"] == ["BNB/USDT"]
-        assert exchange_manager.exchange_config.traded_cryptocurrencies["Binance USD"] == ["BNB/BUSD"]
         assert exchange_manager.exchange_config.traded_cryptocurrencies["Bitcoin"] == ["BNB/BTC"]
         assert exchange_manager.exchange_config.traded_cryptocurrencies["Tether"] == ["BNB/USDT"]
 
-        sorted_pairs_without_redundancy = sorted(["BNB/USDT", "BNB/BUSD", "BNB/BTC"])
+        # inactive markets
+        assert exchange_manager.exchange_config.traded_cryptocurrencies["Binance USD"] == []
+
+        sorted_pairs_without_redundancy = sorted(["BNB/USDT", "BNB/BTC"])
         assert sorted(exchange_manager.exchange_config.traded_symbol_pairs) == sorted_pairs_without_redundancy
 
         cancel_ccxt_throttle_task()

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/real_exchange_tester.py

@@ -35,6 +35,7 @@ class RealExchangeTester:
     SYMBOL = None
     SYMBOL_2 = None
     SYMBOL_3 = None
+    INACTIVE_MARKETS = []
     # default is 1h, change if necessary
     TIME_FRAME = commons_enums.TimeFrames.ONE_HOUR
     ALLOWED_TIMEFRAMES_WITHOUT_CANDLE = 0
@@ -102,6 +103,14 @@ class RealExchangeTester:
     # async def test_create_order(self):
     #     pass
 
+    def ensure_required_market_status_values(self, market_status):
+            assert market_status
+            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
+            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
+            assert market_status[Ecmsc.ACTIVE.value] \
+                   is False if market_status[Ecmsc.SYMBOL.value] in self.INACTIVE_MARKETS else True
+            assert market_status[Ecmsc.PRECISION.value]
+
     async def test_get_historical_ohlcv(self):
         # common implementation, should always work if candles history is supported
         historical_ohlcv = await self.get_historical_ohlcv()

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/test_ascendex.py

@@ -52,10 +52,7 @@ class TestAscendExRealExchangeTester(RealExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            assert market_status
-            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
-            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
-            assert market_status[Ecmsc.PRECISION.value]
+            self.ensure_required_market_status_values(market_status)
             # on AscendEx, precision is a decimal instead of a number of digits
             assert 0 < market_status[Ecmsc.PRECISION.value][
                 Ecmsc.PRECISION_AMOUNT.value] <= 1  # to be fixed in AscendEx tentacle

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/test_binance.py

@@ -32,6 +32,7 @@ class TestBinanceRealExchangeTester(RealExchangeTester):
     SYMBOL = "BTC/USDT"
     SYMBOL_2 = "ETH/BTC"
     SYMBOL_3 = "XRP/BTC"
+    INACTIVE_MARKETS = [SYMBOL_3]
 
     async def test_time_frames(self):
         time_frames = await self.time_frames()
@@ -55,10 +56,7 @@ class TestBinanceRealExchangeTester(RealExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            assert market_status
-            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
-            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
-            assert market_status[Ecmsc.PRECISION.value]
+            self.ensure_required_market_status_values(market_status)
             assert int(market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_AMOUNT.value]) == \
                    market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_AMOUNT.value]
             assert int(market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_PRICE.value]) == \

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/test_binance_futures.py

@@ -59,10 +59,7 @@ class TestBinanceFuturesRealExchangeTester(RealFuturesExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            assert market_status
-            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
-            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
-            assert market_status[Ecmsc.PRECISION.value]
+            self.ensure_required_market_status_values(market_status)
             assert int(market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_AMOUNT.value]) == \
                    market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_AMOUNT.value]
             assert int(market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_PRICE.value]) == \

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/test_bingx.py

@@ -56,10 +56,7 @@ class TestBingxRealExchangeTester(RealExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            assert market_status
-            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
-            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
-            assert market_status[Ecmsc.PRECISION.value]
+            self.ensure_required_market_status_values(market_status)
             assert int(market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_AMOUNT.value]) == \
                    market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_AMOUNT.value]
             assert int(market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_PRICE.value]) == \

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/test_bitfinex.py

@@ -55,10 +55,7 @@ class TestBitfinexRealExchangeTester(RealExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            assert market_status
-            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
-            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
-            assert market_status[Ecmsc.PRECISION.value]
+            self.ensure_required_market_status_values(market_status)
             assert int(market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_AMOUNT.value]) == \
                    market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_AMOUNT.value]
             assert int(market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_PRICE.value]) == \

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/test_bitget.py

@@ -57,10 +57,7 @@ class TestBitgetRealExchangeTester(RealExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            assert market_status
-            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
-            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
-            assert market_status[Ecmsc.PRECISION.value]
+            self.ensure_required_market_status_values(market_status)
             # on Bitget, precision is a decimal instead of a number of digits
             assert 0 < market_status[Ecmsc.PRECISION.value][
                 Ecmsc.PRECISION_AMOUNT.value] < 1  # to be fixed in Bitget tentacle

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/test_bithumb.py

@@ -50,10 +50,7 @@ class TestBithumbRealExchangeTester(RealExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            assert market_status
-            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
-            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
-            assert market_status[Ecmsc.PRECISION.value]
+            self.ensure_required_market_status_values(market_status)
             assert int(market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_AMOUNT.value]) == \
                    market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_AMOUNT.value]
             assert int(market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_PRICE.value]) == \

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/test_bitso.py

@@ -49,10 +49,7 @@ class TestBitsoRealExchangeTester(RealExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            assert market_status
-            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
-            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
-            assert market_status[Ecmsc.PRECISION.value]
+            self.ensure_required_market_status_values(market_status)
             # on this exchange, precision is a decimal instead of a number of digits
             assert 0 < market_status[Ecmsc.PRECISION.value][
                 Ecmsc.PRECISION_AMOUNT.value] <= 1  # to be fixed in this exchange tentacle

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/test_bitstamp.py

@@ -53,10 +53,7 @@ class TestBitstampRealExchangeTester(RealExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            assert market_status
-            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
-            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
-            assert market_status[Ecmsc.PRECISION.value]
+            self.ensure_required_market_status_values(market_status)
             # on this exchange, precision is a decimal instead of a number of digits
             assert 0 < market_status[Ecmsc.PRECISION.value][
                 Ecmsc.PRECISION_AMOUNT.value] <= 1  # to be fixed in this exchange tentacle

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/test_bybit.py

@@ -53,10 +53,7 @@ class TestBybitRealExchangeTester(RealExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            assert market_status
-            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
-            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
-            assert market_status[Ecmsc.PRECISION.value]
+            self.ensure_required_market_status_values(market_status)
             # on Bybit, precision is a decimal instead of a number of digits
             assert 0 < market_status[Ecmsc.PRECISION.value][
                 Ecmsc.PRECISION_AMOUNT.value] <= 1  # to be fixed in Bybit tentacle

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/test_bybit_futures.py

@@ -59,10 +59,7 @@ class TestBybitRealExchangeTester(RealFuturesExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            assert market_status
-            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
-            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
-            assert market_status[Ecmsc.PRECISION.value]
+            self.ensure_required_market_status_values(market_status)
             # on Bybit, precision is a decimal instead of a number of digits
             assert 0 < market_status[Ecmsc.PRECISION.value][
                 Ecmsc.PRECISION_AMOUNT.value] <= 1  # to be fixed in Bybit tentacle

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/test_coinbase.py

@@ -50,10 +50,7 @@ class TestCoinbaseRealExchangeTester(RealExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            assert market_status
-            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
-            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
-            assert market_status[Ecmsc.PRECISION.value]
+            self.ensure_required_market_status_values(market_status)
             assert 0 < market_status[Ecmsc.PRECISION.value][
                 Ecmsc.PRECISION_AMOUNT.value] <= 1  # to be fixed in coinbase tentacle
             assert 0 < market_status[Ecmsc.PRECISION.value][

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/test_coinex.py

@@ -53,10 +53,7 @@ class TestCoinexRealExchangeTester(RealExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            assert market_status
-            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
-            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
-            assert market_status[Ecmsc.PRECISION.value]
+            self.ensure_required_market_status_values(market_status)
             # on this exchange, precision is a decimal instead of a number of digits
             assert 0 < market_status[Ecmsc.PRECISION.value][
                 Ecmsc.PRECISION_AMOUNT.value] <= 1  # to be fixed in this exchange tentacle

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/test_cryptocom.py

@@ -51,10 +51,7 @@ class TestCryptoComRealExchangeTester(RealExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            assert market_status
-            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
-            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
-            assert market_status[Ecmsc.PRECISION.value]
+            self.ensure_required_market_status_values(market_status)
             # on CryptoCom, precision is a decimal instead of a number of digits
             assert 0 < market_status[Ecmsc.PRECISION.value][
                 Ecmsc.PRECISION_AMOUNT.value] <= 1  # to be fixed in CryptoCom tentacle

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/test_gateio.py

@@ -49,10 +49,7 @@ class TestGateIORealExchangeTester(RealExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            assert market_status
-            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
-            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
-            assert market_status[Ecmsc.PRECISION.value]
+            self.ensure_required_market_status_values(market_status)
             assert 1e-08 <= market_status[Ecmsc.PRECISION.value][
                 Ecmsc.PRECISION_AMOUNT.value] < 1   # to be fixed in tentacle
             assert 1e-08 <= market_status[Ecmsc.PRECISION.value][

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/test_hitbtc.py

@@ -50,10 +50,7 @@ class TestHitBtcRealExchangeTester(RealExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            assert market_status
-            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
-            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
-            assert market_status[Ecmsc.PRECISION.value]
+            self.ensure_required_market_status_values(market_status)
             assert 1e-08 <= market_status[Ecmsc.PRECISION.value][
                 Ecmsc.PRECISION_AMOUNT.value] < 1  # to be fixed in hitbtc tentacle
             assert 1e-09 <= market_status[Ecmsc.PRECISION.value][

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/test_hollaex.py

@@ -44,10 +44,7 @@ class TestHollaexRealExchangeTester(RealExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            assert market_status
-            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
-            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
-            assert market_status[Ecmsc.PRECISION.value]
+            self.ensure_required_market_status_values(market_status)
             assert 1e-08 <= market_status[Ecmsc.PRECISION.value][
                 Ecmsc.PRECISION_AMOUNT.value] < 1.0     # to be fixed in tentacle
             assert 1e-08 <= market_status[Ecmsc.PRECISION.value][
@@ -57,6 +54,7 @@ class TestHollaexRealExchangeTester(RealExchangeTester):
                                     Ecmsc.LIMITS_PRICE.value,
                                     Ecmsc.LIMITS_COST.value))
             self.check_market_status_limits(market_status,
+                                            normal_price_max=30000,
                                             normal_cost_min=1e-07,
                                             low_price_min=0.01,  # XRP/USDT instead of /BTC
                                             low_price_max=1,

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/test_htx.py

@@ -50,10 +50,7 @@ class TestHTXRealExchangeTester(RealExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            assert market_status
-            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
-            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
-            assert market_status[Ecmsc.PRECISION.value]
+            self.ensure_required_market_status_values(market_status)
             assert 1e-06 <= market_status[Ecmsc.PRECISION.value][
                 Ecmsc.PRECISION_AMOUNT.value] <= 1  # to be fixed in tentacle
             assert 1e-09 <= market_status[Ecmsc.PRECISION.value][
@@ -85,7 +82,7 @@ class TestHTXRealExchangeTester(RealExchangeTester):
 
         # without useHistoricalEndpointForSpot=False
         useHistoricalEndpointForSpot_symbol_prices = await self.get_symbol_prices(limit=200)
-        assert len(useHistoricalEndpointForSpot_symbol_prices) == 150
+        assert len(useHistoricalEndpointForSpot_symbol_prices) == 200
 
     async def test_get_historical_symbol_prices(self):
         # try with since and limit (used in data collector)

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/test_kraken.py

@@ -49,10 +49,7 @@ class TestKrakenRealExchangeTester(RealExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            assert market_status
-            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
-            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
-            assert market_status[Ecmsc.PRECISION.value]
+            self.ensure_required_market_status_values(market_status)
             # on this exchange, precision is a decimal instead of a number of digits
             assert 0 < market_status[Ecmsc.PRECISION.value][
                 Ecmsc.PRECISION_AMOUNT.value] <= 1  # to be fixed in this exchange tentacle

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/test_kucoin.py

@@ -54,10 +54,7 @@ class TestKucoinRealExchangeTester(RealExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            assert market_status
-            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
-            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
-            assert market_status[Ecmsc.PRECISION.value]
+            self.ensure_required_market_status_values(market_status)
             # on this exchange, precision is a decimal instead of a number of digits
             assert 0 < market_status[Ecmsc.PRECISION.value][
                 Ecmsc.PRECISION_AMOUNT.value] <= 1  # to be fixed in this exchange tentacle

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/test_kucoin_futures.py

@@ -56,10 +56,7 @@ class TestKucoinFuturesRealExchangeTester(RealFuturesExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            assert market_status
-            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
-            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
-            assert market_status[Ecmsc.PRECISION.value]
+            self.ensure_required_market_status_values(market_status)
             # on this exchange, precision is a decimal instead of a number of digits
             assert 0 < market_status[Ecmsc.PRECISION.value][
                 Ecmsc.PRECISION_AMOUNT.value] <= 1  # to be fixed in this exchange tentacle

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/test_mexc.py

@@ -50,10 +50,7 @@ class TestMEXCRealExchangeTester(RealExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            assert market_status
-            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
-            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
-            assert market_status[Ecmsc.PRECISION.value]
+            self.ensure_required_market_status_values(market_status)
             assert 1e-06 <= market_status[Ecmsc.PRECISION.value][
                 Ecmsc.PRECISION_AMOUNT.value] <= 1  # to be fixed in tentacle
             assert 1e-09 <= market_status[Ecmsc.PRECISION.value][

{OctoBot-Trading-2.4.76 → OctoBot-Trading-2.4.78}/tests_additional/real_exchanges/test_ndax.py

@@ -53,10 +53,7 @@ class TestNdaxRealExchangeTester(RealExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            assert market_status
-            assert market_status[Ecmsc.TYPE.value] == self.MARKET_STATUS_TYPE
-            assert market_status[Ecmsc.SYMBOL.value] in (self.SYMBOL, self.SYMBOL_2, self.SYMBOL_3)
-            assert market_status[Ecmsc.PRECISION.value]
+            self.ensure_required_market_status_values(market_status)
             # on this exchange, precision is a decimal instead of a number of digits
             assert 0 < market_status[Ecmsc.PRECISION.value][
                 Ecmsc.PRECISION_AMOUNT.value] <= 1  # to be fixed in this exchange tentacle