Skip to content

Commit 1f522d4

Browse files
committed
chore: simplify order_mask impl
1 parent d7d4151 commit 1f522d4

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

pyinjective/composer.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ def OrderData(self, market_id: str, subaccount_id: str, order_hash: str, **kwarg
5454
elif kwargs.get("is_conditional", False):
5555
order_mask += injective_exchange_pb.OrderMask.REGULAR
5656

57-
if kwargs.get("is_conditional") and kwargs.get("order_direction") == "buy":
57+
if kwargs.get("order_direction") == "buy":
5858
order_mask += injective_exchange_pb.OrderMask.DIRECTION_BUY_OR_HIGHER
5959

60-
elif kwargs.get("is_conditional") and kwargs.get("order_direction") == "sell":
60+
elif kwargs.get("order_direction") == "sell":
6161
order_mask += injective_exchange_pb.OrderMask.DIRECTION_SELL_OR_LOWER
6262

6363
if kwargs.get("order_type") == "market":
@@ -66,6 +66,9 @@ def OrderData(self, market_id: str, subaccount_id: str, order_hash: str, **kwarg
6666
elif kwargs.get("order_type") == "limit":
6767
order_mask += injective_exchange_pb.OrderMask.TYPE_LIMIT
6868

69+
if order_mask == 0:
70+
order_mask = 1
71+
6972
return injective_exchange_tx_pb.OrderData(
7073
market_id=market_id, subaccount_id=subaccount_id, order_hash=order_hash, order_mask=order_mask
7174
)
@@ -560,10 +563,10 @@ def MsgCancelDerivativeOrder(
560563
elif kwargs.get("is_conditional", False):
561564
order_mask += injective_exchange_pb.OrderMask.REGULAR
562565

563-
if kwargs.get("is_conditional") and kwargs.get("order_direction") == "buy":
566+
if kwargs.get("order_direction") == "buy":
564567
order_mask += injective_exchange_pb.OrderMask.DIRECTION_BUY_OR_HIGHER
565568

566-
elif kwargs.get("is_conditional") and kwargs.get("order_direction") == "sell":
569+
elif kwargs.get("order_direction") == "sell":
567570
order_mask += injective_exchange_pb.OrderMask.DIRECTION_SELL_OR_LOWER
568571

569572
if kwargs.get("order_type") == "market":
@@ -572,6 +575,9 @@ def MsgCancelDerivativeOrder(
572575
elif kwargs.get("order_type") == "limit":
573576
order_mask += injective_exchange_pb.OrderMask.TYPE_LIMIT
574577

578+
if order_mask == 0:
579+
order_mask = 1
580+
575581
return injective_exchange_tx_pb.MsgCancelDerivativeOrder(
576582
sender=sender,
577583
market_id=market_id,

0 commit comments

Comments
 (0)