ccxt 4.2.69__py2.py3-none-any.whl → 4.2.71__py2.py3-none-any.whl

ccxt/test/test_async.py

@@ -449,13 +449,30 @@ class testMainClass(baseMainTestClass):
         if self.info:
             args_stringified = '(' + ','.join(args) + ')'
             dump(self.add_padding('[INFO] TESTING', 25), self.exchange_hint(exchange), method_name, args_stringified)
-        skipped_properties = exchange.safe_value(self.skipped_methods, method_name, {})
-        await call_method(self.test_files, method_name, exchange, skipped_properties, args)
+        await call_method(self.test_files, method_name, exchange, self.get_skips(exchange, method_name), args)
         # if it was passed successfully, add to the list of successfull tests
         if is_public:
             self.checked_public_tests[method_name] = True
         return
 
+    def get_skips(self, exchange, method_name):
+        # get "method-specific" skips
+        skips_for_method = exchange.safe_value(self.skipped_methods, method_name, {})
+        # get "object-specific" skips
+        if exchange.in_array(method_name, ['fetchOrderBook', 'fetchOrderBooks', 'fetchL2OrderBook', 'watchOrderBook', 'watchOrderBookForSymbols']):
+            skips = exchange.safe_value(self.skipped_methods, 'orderBook', {})
+            return exchange.deep_extend(skips_for_method, skips)
+        elif exchange.in_array(method_name, ['fetchTicker', 'fetchTickers', 'watchTicker', 'watchTickers']):
+            skips = exchange.safe_value(self.skipped_methods, 'ticker', {})
+            return exchange.deep_extend(skips_for_method, skips)
+        elif exchange.in_array(method_name, ['fetchTrades', 'watchTrades', 'watchTradesForSymbols']):
+            skips = exchange.safe_value(self.skipped_methods, 'trade', {})
+            return exchange.deep_extend(skips_for_method, skips)
+        elif exchange.in_array(method_name, ['fetchOHLCV', 'watchOHLCV', 'watchOHLCVForSymbols']):
+            skips = exchange.safe_value(self.skipped_methods, 'ohlcv', {})
+            return exchange.deep_extend(skips_for_method, skips)
+        return skips_for_method
+
     async def test_safe(self, method_name, exchange, args=[], is_public=False):
         # `testSafe` method does not throw an exception, instead mutes it. The reason we
         # mute the thrown exceptions here is because we don't want to stop the whole
@@ -1215,7 +1232,8 @@ class testMainClass(baseMainTestClass):
         except Exception as e:
             spot_order_request = self.urlencoded_to_dict(exchange.last_request_body)
         client_order_id = spot_order_request['newClientOrderId']
-        assert client_order_id.startswith(str(spot_id)), 'spot clientOrderId does not start with spotId'
+        spot_id_string = str(spot_id)
+        assert client_order_id.startswith(spot_id_string), 'binance - spot clientOrderId: ' + client_order_id + ' does not start with spotId' + spot_id_string
         swap_id = 'x-xcKtGhcu'
         swap_order_request = None
         try:
@@ -1227,10 +1245,11 @@ class testMainClass(baseMainTestClass):
             await exchange.create_order('BTC/USD:BTC', 'limit', 'buy', 1, 20000)
         except Exception as e:
             swap_inverse_order_request = self.urlencoded_to_dict(exchange.last_request_body)
-        client_order_id_spot = swap_order_request['newClientOrderId']
-        assert client_order_id_spot.startswith(str(swap_id)), 'swap clientOrderId does not start with swapId'
+        client_order_id_swap = swap_order_request['newClientOrderId']
+        swap_id_string = str(swap_id)
+        assert client_order_id_swap.startswith(swap_id_string), 'binance - swap clientOrderId: ' + client_order_id_swap + ' does not start with swapId' + swap_id_string
         client_order_id_inverse = swap_inverse_order_request['newClientOrderId']
-        assert client_order_id_inverse.startswith(str(swap_id)), 'swap clientOrderIdInverse does not start with swapId'
+        assert client_order_id_inverse.startswith(swap_id_string), 'binance - swap clientOrderIdInverse: ' + client_order_id_inverse + ' does not start with swapId' + swap_id_string
         await close(exchange)
         return True
 
@@ -1243,16 +1262,19 @@ class testMainClass(baseMainTestClass):
         except Exception as e:
             spot_order_request = json_parse(exchange.last_request_body)
         client_order_id = spot_order_request[0]['clOrdId']  # returns order inside array
-        assert client_order_id.startswith(str(id)), 'spot clientOrderId does not start with id'
-        assert spot_order_request[0]['tag'] == id, 'id different from spot tag'
+        id_string = str(id)
+        assert client_order_id.startswith(id_string), 'okx - spot clientOrderId: ' + client_order_id + ' does not start with id: ' + id_string
+        spot_tag = spot_order_request[0]['tag']
+        assert spot_tag == id, 'okx - id: ' + id + ' different from spot tag: ' + spot_tag
         swap_order_request = None
         try:
             await exchange.create_order('BTC/USDT:USDT', 'limit', 'buy', 1, 20000)
         except Exception as e:
             swap_order_request = json_parse(exchange.last_request_body)
-        client_order_id_spot = swap_order_request[0]['clOrdId']
-        assert client_order_id_spot.startswith(str(id)), 'swap clientOrderId does not start with id'
-        assert swap_order_request[0]['tag'] == id, 'id different from swap tag'
+        client_order_id_swap = swap_order_request[0]['clOrdId']
+        assert client_order_id_swap.startswith(id_string), 'okx - swap clientOrderId: ' + client_order_id_swap + ' does not start with id: ' + id_string
+        swap_tag = swap_order_request[0]['tag']
+        assert swap_tag == id, 'okx - id: ' + id + ' different from swap tag: ' + swap_tag
         await close(exchange)
         return True
 
@@ -1265,7 +1287,8 @@ class testMainClass(baseMainTestClass):
             await exchange.create_order('BTC/USDT', 'limit', 'buy', 1, 20000)
         except Exception as e:
             request = json_parse(exchange.last_request_body)
-        assert request['params']['broker_id'] == id, 'id different from  broker_id'
+        broker_id = request['params']['broker_id']
+        assert broker_id == id, 'cryptocom - id: ' + id + ' different from  broker_id: ' + broker_id
         await close(exchange)
         return True
 
@@ -1279,22 +1302,25 @@ class testMainClass(baseMainTestClass):
         except Exception as e:
             # we expect an error here, we're only interested in the headers
             req_headers = exchange.last_request_headers
-        assert req_headers['Referer'] == id, 'id not in headers'
+        assert req_headers['Referer'] == id, 'bybit - id: ' + id + ' not in headers.'
         await close(exchange)
         return True
 
     async def test_kucoin(self):
         exchange = self.init_offline_exchange('kucoin')
         req_headers = None
-        assert exchange.options['partner']['spot']['id'] == 'ccxt', 'id not in options'
-        assert exchange.options['partner']['spot']['key'] == '9e58cc35-5b5e-4133-92ec-166e3f077cb8', 'key not in options'
+        options_string = str(exchange.options)
+        spot_id = exchange.options['partner']['spot']['id']
+        spot_key = exchange.options['partner']['spot']['key']
+        assert spot_id == 'ccxt', 'kucoin - id: ' + spot_id + ' not in options: ' + options_string
+        assert spot_key == '9e58cc35-5b5e-4133-92ec-166e3f077cb8', 'kucoin - key: ' + spot_key + ' not in options: ' + options_string
         try:
             await exchange.create_order('BTC/USDT', 'limit', 'buy', 1, 20000)
         except Exception as e:
             # we expect an error here, we're only interested in the headers
             req_headers = exchange.last_request_headers
         id = 'ccxt'
-        assert req_headers['KC-API-PARTNER'] == id, 'id not in headers'
+        assert req_headers['KC-API-PARTNER'] == id, 'kucoin - id: ' + id + ' not in headers.'
         await close(exchange)
         return True
 
@@ -1302,13 +1328,16 @@ class testMainClass(baseMainTestClass):
         exchange = self.init_offline_exchange('kucoinfutures')
         req_headers = None
         id = 'ccxtfutures'
-        assert exchange.options['partner']['future']['id'] == id, 'id not in options'
-        assert exchange.options['partner']['future']['key'] == '1b327198-f30c-4f14-a0ac-918871282f15', 'key not in options'
+        options_string = str(exchange.options['partner']['future'])
+        future_id = exchange.options['partner']['future']['id']
+        future_key = exchange.options['partner']['future']['key']
+        assert future_id == id, 'kucoinfutures - id: ' + future_id + ' not in options: ' + options_string
+        assert future_key == '1b327198-f30c-4f14-a0ac-918871282f15', 'kucoinfutures - key: ' + future_key + ' not in options: ' + options_string
         try:
             await exchange.create_order('BTC/USDT:USDT', 'limit', 'buy', 1, 20000)
         except Exception as e:
             req_headers = exchange.last_request_headers
-        assert req_headers['KC-API-PARTNER'] == id, 'id not in headers'
+        assert req_headers['KC-API-PARTNER'] == id, 'kucoinfutures - id: ' + id + ' not in headers.'
         await close(exchange)
         return True
 
@@ -1316,12 +1345,13 @@ class testMainClass(baseMainTestClass):
         exchange = self.init_offline_exchange('bitget')
         req_headers = None
         id = 'p4sve'
-        assert exchange.options['broker'] == id, 'id not in options'
+        options_string = str(exchange.options)
+        assert exchange.options['broker'] == id, 'bitget - id: ' + id + ' not in options: ' + options_string
         try:
             await exchange.create_order('BTC/USDT', 'limit', 'buy', 1, 20000)
         except Exception as e:
             req_headers = exchange.last_request_headers
-        assert req_headers['X-CHANNEL-API-CODE'] == id, 'id not in headers'
+        assert req_headers['X-CHANNEL-API-CODE'] == id, 'bitget - id: ' + id + ' not in headers.'
         await close(exchange)
         return True
 
@@ -1329,13 +1359,15 @@ class testMainClass(baseMainTestClass):
         exchange = self.init_offline_exchange('mexc')
         req_headers = None
         id = 'CCXT'
-        assert exchange.options['broker'] == id, 'id not in options'
+        options_string = str(exchange.options)
+        assert exchange.options['broker'] == id, 'mexc - id: ' + id + ' not in options: ' + options_string
         await exchange.load_markets()
         try:
             await exchange.create_order('BTC/USDT', 'limit', 'buy', 1, 20000)
         except Exception as e:
             req_headers = exchange.last_request_headers
-        assert req_headers['source'] == id, 'id not in headers'
+        req_headers_string = str(req_headers) if req_headers is not None else 'undefined'
+        assert req_headers['source'] == id, 'mexc - id: ' + id + ' not in headers: ' + req_headers_string
         await close(exchange)
         return True
 
@@ -1349,7 +1381,8 @@ class testMainClass(baseMainTestClass):
         except Exception as e:
             spot_order_request = json_parse(exchange.last_request_body)
         client_order_id = spot_order_request['client-order-id']
-        assert client_order_id.startswith(str(id)), 'spot clientOrderId does not start with id'
+        id_string = str(id)
+        assert client_order_id.startswith(id_string), 'htx - spot clientOrderId ' + client_order_id + ' does not start with id: ' + id_string
         # swap test
         swap_order_request = None
         try:
@@ -1361,10 +1394,10 @@ class testMainClass(baseMainTestClass):
             await exchange.create_order('BTC/USD:BTC', 'limit', 'buy', 1, 20000)
         except Exception as e:
             swap_inverse_order_request = json_parse(exchange.last_request_body)
-        client_order_id_spot = swap_order_request['channel_code']
-        assert client_order_id_spot.startswith(str(id)), 'swap channel_code does not start with id'
+        client_order_id_swap = swap_order_request['channel_code']
+        assert client_order_id_swap.startswith(id_string), 'htx - swap channel_code ' + client_order_id_swap + ' does not start with id: ' + id_string
         client_order_id_inverse = swap_inverse_order_request['channel_code']
-        assert client_order_id_inverse.startswith(str(id)), 'swap inverse channel_code does not start with id'
+        assert client_order_id_inverse.startswith(id_string), 'htx - swap inverse channel_code ' + client_order_id_inverse + ' does not start with id: ' + id_string
         await close(exchange)
         return True
 
@@ -1378,7 +1411,8 @@ class testMainClass(baseMainTestClass):
         except Exception as e:
             spot_order_request = self.urlencoded_to_dict(exchange.last_request_body)
         broker_id = spot_order_request['broker_id']
-        assert broker_id.startswith(str(id)), 'broker_id does not start with id'
+        id_string = str(id)
+        assert broker_id.startswith(id_string), 'woo - broker_id: ' + broker_id + ' does not start with id: ' + id_string
         # swap test
         stop_order_request = None
         try:
@@ -1387,8 +1421,8 @@ class testMainClass(baseMainTestClass):
             })
         except Exception as e:
             stop_order_request = json_parse(exchange.last_request_body)
-        client_order_id_spot = stop_order_request['brokerId']
-        assert client_order_id_spot.startswith(str(id)), 'brokerId does not start with id'
+        client_order_id_stop = stop_order_request['brokerId']
+        assert client_order_id_stop.startswith(id_string), 'woo - brokerId: ' + client_order_id_stop + ' does not start with id: ' + id_string
         await close(exchange)
         return True
 
@@ -1396,27 +1430,28 @@ class testMainClass(baseMainTestClass):
         exchange = self.init_offline_exchange('bitmart')
         req_headers = None
         id = 'CCXTxBitmart000'
-        assert exchange.options['brokerId'] == id, 'id not in options'
+        assert exchange.options['brokerId'] == id, 'bitmart - id: ' + id + ' not in options'
         await exchange.load_markets()
         try:
             await exchange.create_order('BTC/USDT', 'limit', 'buy', 1, 20000)
         except Exception as e:
             req_headers = exchange.last_request_headers
-        assert req_headers['X-BM-BROKER-ID'] == id, 'id not in headers'
+        assert req_headers['X-BM-BROKER-ID'] == id, 'bitmart - id: ' + id + ' not in headers'
         await close(exchange)
         return True
 
     async def test_coinex(self):
         exchange = self.init_offline_exchange('coinex')
         id = 'x-167673045'
-        assert exchange.options['brokerId'] == id, 'id not in options'
+        assert exchange.options['brokerId'] == id, 'coinex - id: ' + id + ' not in options'
         spot_order_request = None
         try:
             await exchange.create_order('BTC/USDT', 'limit', 'buy', 1, 20000)
         except Exception as e:
             spot_order_request = json_parse(exchange.last_request_body)
         client_order_id = spot_order_request['client_id']
-        assert client_order_id.startswith(str(id)), 'clientOrderId does not start with id'
+        id_string = str(id)
+        assert client_order_id.startswith(id_string), 'coinex - clientOrderId: ' + client_order_id + ' does not start with id: ' + id_string
         await close(exchange)
         return True
 
@@ -1424,13 +1459,15 @@ class testMainClass(baseMainTestClass):
         exchange = self.init_offline_exchange('bingx')
         req_headers = None
         id = 'CCXT'
-        assert exchange.options['broker'] == id, 'id not in options'
+        options_string = str(exchange.options)
+        assert exchange.options['broker'] == id, 'bingx - id: ' + id + ' not in options: ' + options_string
         try:
             await exchange.create_order('BTC/USDT', 'limit', 'buy', 1, 20000)
         except Exception as e:
             # we expect an error here, we're only interested in the headers
             req_headers = exchange.last_request_headers
-        assert req_headers['X-SOURCE-KEY'] == id, 'id not in headers'
+        req_headers_string = str(req_headers) if req_headers is not None else 'undefined'
+        assert req_headers['X-SOURCE-KEY'] == id, 'bingx - id: ' + id + ' not in headers: ' + req_headers_string
         await close(exchange)
 
     async def test_phemex(self):
@@ -1442,7 +1479,8 @@ class testMainClass(baseMainTestClass):
         except Exception as e:
             request = json_parse(exchange.last_request_body)
         client_order_id = request['clOrdID']
-        assert client_order_id.startswith(str(id)), 'clOrdID does not start with id'
+        id_string = str(id)
+        assert client_order_id.startswith(id_string), 'phemex - clOrdID: ' + client_order_id + ' does not start with id: ' + id_string
         await close(exchange)
 
     async def test_blofin(self):
@@ -1454,7 +1492,8 @@ class testMainClass(baseMainTestClass):
         except Exception as e:
             request = json_parse(exchange.last_request_body)
         broker_id = request['brokerId']
-        assert broker_id.startswith(str(id)), 'brokerId does not start with id'
+        id_string = str(id)
+        assert broker_id.startswith(id_string), 'blofin - brokerId: ' + broker_id + ' does not start with id: ' + id_string
         await close(exchange)
 
     async def test_hyperliquid(self):
@@ -1466,7 +1505,7 @@ class testMainClass(baseMainTestClass):
         except Exception as e:
             request = json_parse(exchange.last_request_body)
         broker_id = str((request['action']['brokerCode']))
-        assert broker_id == id, 'brokerId does not start with id'
+        assert broker_id == id, 'hyperliquid - brokerId: ' + broker_id + ' does not start with id: ' + id
         await close(exchange)
 
 # ***** AUTO-TRANSPILER-END *****

ccxt/test/test_sync.py

@@ -448,13 +448,30 @@ class testMainClass(baseMainTestClass):
         if self.info:
             args_stringified = '(' + ','.join(args) + ')'
             dump(self.add_padding('[INFO] TESTING', 25), self.exchange_hint(exchange), method_name, args_stringified)
-        skipped_properties = exchange.safe_value(self.skipped_methods, method_name, {})
-        call_method(self.test_files, method_name, exchange, skipped_properties, args)
+        call_method(self.test_files, method_name, exchange, self.get_skips(exchange, method_name), args)
         # if it was passed successfully, add to the list of successfull tests
         if is_public:
             self.checked_public_tests[method_name] = True
         return
 
+    def get_skips(self, exchange, method_name):
+        # get "method-specific" skips
+        skips_for_method = exchange.safe_value(self.skipped_methods, method_name, {})
+        # get "object-specific" skips
+        if exchange.in_array(method_name, ['fetchOrderBook', 'fetchOrderBooks', 'fetchL2OrderBook', 'watchOrderBook', 'watchOrderBookForSymbols']):
+            skips = exchange.safe_value(self.skipped_methods, 'orderBook', {})
+            return exchange.deep_extend(skips_for_method, skips)
+        elif exchange.in_array(method_name, ['fetchTicker', 'fetchTickers', 'watchTicker', 'watchTickers']):
+            skips = exchange.safe_value(self.skipped_methods, 'ticker', {})
+            return exchange.deep_extend(skips_for_method, skips)
+        elif exchange.in_array(method_name, ['fetchTrades', 'watchTrades', 'watchTradesForSymbols']):
+            skips = exchange.safe_value(self.skipped_methods, 'trade', {})
+            return exchange.deep_extend(skips_for_method, skips)
+        elif exchange.in_array(method_name, ['fetchOHLCV', 'watchOHLCV', 'watchOHLCVForSymbols']):
+            skips = exchange.safe_value(self.skipped_methods, 'ohlcv', {})
+            return exchange.deep_extend(skips_for_method, skips)
+        return skips_for_method
+
     def test_safe(self, method_name, exchange, args=[], is_public=False):
         # `testSafe` method does not throw an exception, instead mutes it. The reason we
         # mute the thrown exceptions here is because we don't want to stop the whole
@@ -1214,7 +1231,8 @@ class testMainClass(baseMainTestClass):
         except Exception as e:
             spot_order_request = self.urlencoded_to_dict(exchange.last_request_body)
         client_order_id = spot_order_request['newClientOrderId']
-        assert client_order_id.startswith(str(spot_id)), 'spot clientOrderId does not start with spotId'
+        spot_id_string = str(spot_id)
+        assert client_order_id.startswith(spot_id_string), 'binance - spot clientOrderId: ' + client_order_id + ' does not start with spotId' + spot_id_string
         swap_id = 'x-xcKtGhcu'
         swap_order_request = None
         try:
@@ -1226,10 +1244,11 @@ class testMainClass(baseMainTestClass):
             exchange.create_order('BTC/USD:BTC', 'limit', 'buy', 1, 20000)
         except Exception as e:
             swap_inverse_order_request = self.urlencoded_to_dict(exchange.last_request_body)
-        client_order_id_spot = swap_order_request['newClientOrderId']
-        assert client_order_id_spot.startswith(str(swap_id)), 'swap clientOrderId does not start with swapId'
+        client_order_id_swap = swap_order_request['newClientOrderId']
+        swap_id_string = str(swap_id)
+        assert client_order_id_swap.startswith(swap_id_string), 'binance - swap clientOrderId: ' + client_order_id_swap + ' does not start with swapId' + swap_id_string
         client_order_id_inverse = swap_inverse_order_request['newClientOrderId']
-        assert client_order_id_inverse.startswith(str(swap_id)), 'swap clientOrderIdInverse does not start with swapId'
+        assert client_order_id_inverse.startswith(swap_id_string), 'binance - swap clientOrderIdInverse: ' + client_order_id_inverse + ' does not start with swapId' + swap_id_string
         close(exchange)
         return True
 
@@ -1242,16 +1261,19 @@ class testMainClass(baseMainTestClass):
         except Exception as e:
             spot_order_request = json_parse(exchange.last_request_body)
         client_order_id = spot_order_request[0]['clOrdId']  # returns order inside array
-        assert client_order_id.startswith(str(id)), 'spot clientOrderId does not start with id'
-        assert spot_order_request[0]['tag'] == id, 'id different from spot tag'
+        id_string = str(id)
+        assert client_order_id.startswith(id_string), 'okx - spot clientOrderId: ' + client_order_id + ' does not start with id: ' + id_string
+        spot_tag = spot_order_request[0]['tag']
+        assert spot_tag == id, 'okx - id: ' + id + ' different from spot tag: ' + spot_tag
         swap_order_request = None
         try:
             exchange.create_order('BTC/USDT:USDT', 'limit', 'buy', 1, 20000)
         except Exception as e:
             swap_order_request = json_parse(exchange.last_request_body)
-        client_order_id_spot = swap_order_request[0]['clOrdId']
-        assert client_order_id_spot.startswith(str(id)), 'swap clientOrderId does not start with id'
-        assert swap_order_request[0]['tag'] == id, 'id different from swap tag'
+        client_order_id_swap = swap_order_request[0]['clOrdId']
+        assert client_order_id_swap.startswith(id_string), 'okx - swap clientOrderId: ' + client_order_id_swap + ' does not start with id: ' + id_string
+        swap_tag = swap_order_request[0]['tag']
+        assert swap_tag == id, 'okx - id: ' + id + ' different from swap tag: ' + swap_tag
         close(exchange)
         return True
 
@@ -1264,7 +1286,8 @@ class testMainClass(baseMainTestClass):
             exchange.create_order('BTC/USDT', 'limit', 'buy', 1, 20000)
         except Exception as e:
             request = json_parse(exchange.last_request_body)
-        assert request['params']['broker_id'] == id, 'id different from  broker_id'
+        broker_id = request['params']['broker_id']
+        assert broker_id == id, 'cryptocom - id: ' + id + ' different from  broker_id: ' + broker_id
         close(exchange)
         return True
 
@@ -1278,22 +1301,25 @@ class testMainClass(baseMainTestClass):
         except Exception as e:
             # we expect an error here, we're only interested in the headers
             req_headers = exchange.last_request_headers
-        assert req_headers['Referer'] == id, 'id not in headers'
+        assert req_headers['Referer'] == id, 'bybit - id: ' + id + ' not in headers.'
         close(exchange)
         return True
 
     def test_kucoin(self):
         exchange = self.init_offline_exchange('kucoin')
         req_headers = None
-        assert exchange.options['partner']['spot']['id'] == 'ccxt', 'id not in options'
-        assert exchange.options['partner']['spot']['key'] == '9e58cc35-5b5e-4133-92ec-166e3f077cb8', 'key not in options'
+        options_string = str(exchange.options)
+        spot_id = exchange.options['partner']['spot']['id']
+        spot_key = exchange.options['partner']['spot']['key']
+        assert spot_id == 'ccxt', 'kucoin - id: ' + spot_id + ' not in options: ' + options_string
+        assert spot_key == '9e58cc35-5b5e-4133-92ec-166e3f077cb8', 'kucoin - key: ' + spot_key + ' not in options: ' + options_string
         try:
             exchange.create_order('BTC/USDT', 'limit', 'buy', 1, 20000)
         except Exception as e:
             # we expect an error here, we're only interested in the headers
             req_headers = exchange.last_request_headers
         id = 'ccxt'
-        assert req_headers['KC-API-PARTNER'] == id, 'id not in headers'
+        assert req_headers['KC-API-PARTNER'] == id, 'kucoin - id: ' + id + ' not in headers.'
         close(exchange)
         return True
 
@@ -1301,13 +1327,16 @@ class testMainClass(baseMainTestClass):
         exchange = self.init_offline_exchange('kucoinfutures')
         req_headers = None
         id = 'ccxtfutures'
-        assert exchange.options['partner']['future']['id'] == id, 'id not in options'
-        assert exchange.options['partner']['future']['key'] == '1b327198-f30c-4f14-a0ac-918871282f15', 'key not in options'
+        options_string = str(exchange.options['partner']['future'])
+        future_id = exchange.options['partner']['future']['id']
+        future_key = exchange.options['partner']['future']['key']
+        assert future_id == id, 'kucoinfutures - id: ' + future_id + ' not in options: ' + options_string
+        assert future_key == '1b327198-f30c-4f14-a0ac-918871282f15', 'kucoinfutures - key: ' + future_key + ' not in options: ' + options_string
         try:
             exchange.create_order('BTC/USDT:USDT', 'limit', 'buy', 1, 20000)
         except Exception as e:
             req_headers = exchange.last_request_headers
-        assert req_headers['KC-API-PARTNER'] == id, 'id not in headers'
+        assert req_headers['KC-API-PARTNER'] == id, 'kucoinfutures - id: ' + id + ' not in headers.'
         close(exchange)
         return True
 
@@ -1315,12 +1344,13 @@ class testMainClass(baseMainTestClass):
         exchange = self.init_offline_exchange('bitget')
         req_headers = None
         id = 'p4sve'
-        assert exchange.options['broker'] == id, 'id not in options'
+        options_string = str(exchange.options)
+        assert exchange.options['broker'] == id, 'bitget - id: ' + id + ' not in options: ' + options_string
         try:
             exchange.create_order('BTC/USDT', 'limit', 'buy', 1, 20000)
         except Exception as e:
             req_headers = exchange.last_request_headers
-        assert req_headers['X-CHANNEL-API-CODE'] == id, 'id not in headers'
+        assert req_headers['X-CHANNEL-API-CODE'] == id, 'bitget - id: ' + id + ' not in headers.'
         close(exchange)
         return True
 
@@ -1328,13 +1358,15 @@ class testMainClass(baseMainTestClass):
         exchange = self.init_offline_exchange('mexc')
         req_headers = None
         id = 'CCXT'
-        assert exchange.options['broker'] == id, 'id not in options'
+        options_string = str(exchange.options)
+        assert exchange.options['broker'] == id, 'mexc - id: ' + id + ' not in options: ' + options_string
         exchange.load_markets()
         try:
             exchange.create_order('BTC/USDT', 'limit', 'buy', 1, 20000)
         except Exception as e:
             req_headers = exchange.last_request_headers
-        assert req_headers['source'] == id, 'id not in headers'
+        req_headers_string = str(req_headers) if req_headers is not None else 'undefined'
+        assert req_headers['source'] == id, 'mexc - id: ' + id + ' not in headers: ' + req_headers_string
         close(exchange)
         return True
 
@@ -1348,7 +1380,8 @@ class testMainClass(baseMainTestClass):
         except Exception as e:
             spot_order_request = json_parse(exchange.last_request_body)
         client_order_id = spot_order_request['client-order-id']
-        assert client_order_id.startswith(str(id)), 'spot clientOrderId does not start with id'
+        id_string = str(id)
+        assert client_order_id.startswith(id_string), 'htx - spot clientOrderId ' + client_order_id + ' does not start with id: ' + id_string
         # swap test
         swap_order_request = None
         try:
@@ -1360,10 +1393,10 @@ class testMainClass(baseMainTestClass):
             exchange.create_order('BTC/USD:BTC', 'limit', 'buy', 1, 20000)
         except Exception as e:
             swap_inverse_order_request = json_parse(exchange.last_request_body)
-        client_order_id_spot = swap_order_request['channel_code']
-        assert client_order_id_spot.startswith(str(id)), 'swap channel_code does not start with id'
+        client_order_id_swap = swap_order_request['channel_code']
+        assert client_order_id_swap.startswith(id_string), 'htx - swap channel_code ' + client_order_id_swap + ' does not start with id: ' + id_string
         client_order_id_inverse = swap_inverse_order_request['channel_code']
-        assert client_order_id_inverse.startswith(str(id)), 'swap inverse channel_code does not start with id'
+        assert client_order_id_inverse.startswith(id_string), 'htx - swap inverse channel_code ' + client_order_id_inverse + ' does not start with id: ' + id_string
         close(exchange)
         return True
 
@@ -1377,7 +1410,8 @@ class testMainClass(baseMainTestClass):
         except Exception as e:
             spot_order_request = self.urlencoded_to_dict(exchange.last_request_body)
         broker_id = spot_order_request['broker_id']
-        assert broker_id.startswith(str(id)), 'broker_id does not start with id'
+        id_string = str(id)
+        assert broker_id.startswith(id_string), 'woo - broker_id: ' + broker_id + ' does not start with id: ' + id_string
         # swap test
         stop_order_request = None
         try:
@@ -1386,8 +1420,8 @@ class testMainClass(baseMainTestClass):
             })
         except Exception as e:
             stop_order_request = json_parse(exchange.last_request_body)
-        client_order_id_spot = stop_order_request['brokerId']
-        assert client_order_id_spot.startswith(str(id)), 'brokerId does not start with id'
+        client_order_id_stop = stop_order_request['brokerId']
+        assert client_order_id_stop.startswith(id_string), 'woo - brokerId: ' + client_order_id_stop + ' does not start with id: ' + id_string
         close(exchange)
         return True
 
@@ -1395,27 +1429,28 @@ class testMainClass(baseMainTestClass):
         exchange = self.init_offline_exchange('bitmart')
         req_headers = None
         id = 'CCXTxBitmart000'
-        assert exchange.options['brokerId'] == id, 'id not in options'
+        assert exchange.options['brokerId'] == id, 'bitmart - id: ' + id + ' not in options'
         exchange.load_markets()
         try:
             exchange.create_order('BTC/USDT', 'limit', 'buy', 1, 20000)
         except Exception as e:
             req_headers = exchange.last_request_headers
-        assert req_headers['X-BM-BROKER-ID'] == id, 'id not in headers'
+        assert req_headers['X-BM-BROKER-ID'] == id, 'bitmart - id: ' + id + ' not in headers'
         close(exchange)
         return True
 
     def test_coinex(self):
         exchange = self.init_offline_exchange('coinex')
         id = 'x-167673045'
-        assert exchange.options['brokerId'] == id, 'id not in options'
+        assert exchange.options['brokerId'] == id, 'coinex - id: ' + id + ' not in options'
         spot_order_request = None
         try:
             exchange.create_order('BTC/USDT', 'limit', 'buy', 1, 20000)
         except Exception as e:
             spot_order_request = json_parse(exchange.last_request_body)
         client_order_id = spot_order_request['client_id']
-        assert client_order_id.startswith(str(id)), 'clientOrderId does not start with id'
+        id_string = str(id)
+        assert client_order_id.startswith(id_string), 'coinex - clientOrderId: ' + client_order_id + ' does not start with id: ' + id_string
         close(exchange)
         return True
 
@@ -1423,13 +1458,15 @@ class testMainClass(baseMainTestClass):
         exchange = self.init_offline_exchange('bingx')
         req_headers = None
         id = 'CCXT'
-        assert exchange.options['broker'] == id, 'id not in options'
+        options_string = str(exchange.options)
+        assert exchange.options['broker'] == id, 'bingx - id: ' + id + ' not in options: ' + options_string
         try:
             exchange.create_order('BTC/USDT', 'limit', 'buy', 1, 20000)
         except Exception as e:
             # we expect an error here, we're only interested in the headers
             req_headers = exchange.last_request_headers
-        assert req_headers['X-SOURCE-KEY'] == id, 'id not in headers'
+        req_headers_string = str(req_headers) if req_headers is not None else 'undefined'
+        assert req_headers['X-SOURCE-KEY'] == id, 'bingx - id: ' + id + ' not in headers: ' + req_headers_string
         close(exchange)
 
     def test_phemex(self):
@@ -1441,7 +1478,8 @@ class testMainClass(baseMainTestClass):
         except Exception as e:
             request = json_parse(exchange.last_request_body)
         client_order_id = request['clOrdID']
-        assert client_order_id.startswith(str(id)), 'clOrdID does not start with id'
+        id_string = str(id)
+        assert client_order_id.startswith(id_string), 'phemex - clOrdID: ' + client_order_id + ' does not start with id: ' + id_string
         close(exchange)
 
     def test_blofin(self):
@@ -1453,7 +1491,8 @@ class testMainClass(baseMainTestClass):
         except Exception as e:
             request = json_parse(exchange.last_request_body)
         broker_id = request['brokerId']
-        assert broker_id.startswith(str(id)), 'brokerId does not start with id'
+        id_string = str(id)
+        assert broker_id.startswith(id_string), 'blofin - brokerId: ' + broker_id + ' does not start with id: ' + id_string
         close(exchange)
 
     def test_hyperliquid(self):
@@ -1465,7 +1504,7 @@ class testMainClass(baseMainTestClass):
         except Exception as e:
             request = json_parse(exchange.last_request_body)
         broker_id = str((request['action']['brokerCode']))
-        assert broker_id == id, 'brokerId does not start with id'
+        assert broker_id == id, 'hyperliquid - brokerId: ' + broker_id + ' does not start with id: ' + id
         close(exchange)
 
 # ***** AUTO-TRANSPILER-END *****

ccxt/wazirx.py

@@ -6,7 +6,7 @@
 from ccxt.base.exchange import Exchange
 from ccxt.abstract.wazirx import ImplicitAPI
 import hashlib
-from ccxt.base.types import Balances, Currency, Int, Market, Order, OrderBook, OrderSide, OrderType, Num, Str, Strings, Ticker, Tickers, Trade, Transaction
+from ccxt.base.types import Balances, Currency, Int, Market, Num, Order, OrderBook, OrderSide, OrderType, Str, Strings, Ticker, Tickers, Trade, Transaction
 from typing import List
 from ccxt.base.errors import ExchangeError
 from ccxt.base.errors import PermissionDenied

ccxt/whitebit.py

@@ -6,7 +6,7 @@
 from ccxt.base.exchange import Exchange
 from ccxt.abstract.whitebit import ImplicitAPI
 import hashlib
-from ccxt.base.types import Balances, Currency, Int, MarketType, Market, Order, TransferEntry, OrderBook, OrderSide, OrderType, Str, Bool, Strings, Ticker, Tickers, Trade, Transaction
+from ccxt.base.types import Balances, Bool, Currency, Int, Market, MarketType, Order, OrderBook, OrderSide, OrderType, Str, Strings, Ticker, Tickers, Trade, Transaction, TransferEntry
 from typing import List
 from ccxt.base.errors import ExchangeError
 from ccxt.base.errors import PermissionDenied

ccxt/woo.py

@@ -6,7 +6,7 @@
 from ccxt.base.exchange import Exchange
 from ccxt.abstract.woo import ImplicitAPI
 import hashlib
-from ccxt.base.types import Balances, Currency, Int, Leverage, MarketType, Market, Order, TransferEntry, OrderBook, OrderSide, OrderType, Num, Str, Bool, Strings, Trade, Transaction
+from ccxt.base.types import Balances, Bool, Currency, Int, Leverage, Market, MarketType, Num, Order, OrderBook, OrderSide, OrderType, Str, Strings, Trade, Transaction, TransferEntry
 from typing import List
 from ccxt.base.errors import ExchangeError
 from ccxt.base.errors import ArgumentsRequired