diff --git a/huobi/service/account/sub_account_update_v2.py b/huobi/service/account/sub_account_update_v2.py index a1e1b3f9..04b1efa6 100644 --- a/huobi/service/account/sub_account_update_v2.py +++ b/huobi/service/account/sub_account_update_v2.py @@ -10,9 +10,10 @@ def __init__(self, params): def subscribe(self, callback, error_handler, **kwargs): mode = self.params["mode"] + action = self.params['action'] def subscription(connection): - connection.send(accounts_update_channel(mode)) + connection.send(accounts_update_channel(mode, action)) def parse(dict_data): account_change_event = AccountUpdateEvent() diff --git a/huobi/service/trade/sub_order_update_v2.py b/huobi/service/trade/sub_order_update_v2.py index 681c8c2d..58051791 100644 --- a/huobi/service/trade/sub_order_update_v2.py +++ b/huobi/service/trade/sub_order_update_v2.py @@ -10,11 +10,12 @@ def __init__(self, params): self.params = params def subscribe(self, callback, error_handler, **kwargs): + action = self.params["action"] symbol_list = self.params["symbol_list"] def subscription(connection): for val in symbol_list: - connection.send(orders_update_channel(val)) + connection.send(orders_update_channel(val, action=action)) time.sleep(0.01) def parse(dict_data): diff --git a/huobi/service/trade/sub_trade_clearing_v2.py b/huobi/service/trade/sub_trade_clearing_v2.py index f6ac4c5b..12cd0bf5 100644 --- a/huobi/service/trade/sub_trade_clearing_v2.py +++ b/huobi/service/trade/sub_trade_clearing_v2.py @@ -10,11 +10,13 @@ def __init__(self, params): self.params = params def subscribe(self, callback, error_handler, **kwargs): + mode = self.params["mode"] + action = self.params["action"] symbol_list = self.params["symbol_list"] def subscription(connection): for symbol in symbol_list: - connection.send(trade_clearing_channel(symbol)) + connection.send(trade_clearing_channel(symbol=symbol,mode=mode,action=action)) time.sleep(0.01) def parse(dict_data): diff --git a/huobi/utils/channels.py b/huobi/utils/channels.py index ea97e159..ba2380aa 100644 --- a/huobi/utils/channels.py +++ b/huobi/utils/channels.py @@ -31,9 +31,9 @@ def price_depth_bbo_channel(symbol): return json.dumps(channel) -def orders_update_channel(symbol): +def orders_update_channel(symbol, action='sub'): channel = dict() - channel["action"] = "sub" + channel["action"] = action channel["ch"] = "orders#{symbol}".format(symbol=symbol) return json.dumps(channel) @@ -45,9 +45,9 @@ def market_detail_channel(symbol): return json.dumps(channel) -def accounts_update_channel(mode=0): +def accounts_update_channel(mode=0, action='sub'): channel = dict() - channel["action"] = "sub" + channel["action"] = action if mode is None: channel["ch"] = "accounts.update" else: @@ -76,9 +76,9 @@ def request_mbp_channel(symbol, levels): return json.dumps(channel) -def trade_clearing_channel(symbol="*", mode="0"): +def trade_clearing_channel(symbol="*", mode="0", action='sub'): channel = dict() - channel["action"] = "sub" + channel["action"] = action channel["ch"] = "trade.clearing#" + symbol + "#" + mode return json.dumps(channel) diff --git a/setup.py b/setup.py index 479e0c96..d83d09a0 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ setup( name="huobi-client", - version="2.0.0", + version="2.0.1", packages=['huobi', 'huobi.exception', 'huobi.constant', 'huobi.utils',