Skip to content

Commit 4980b41

Browse files
aarmoaaarmoa
committed
(fix) Rename all methods having v2 in the middle of the name to have v2 as suffix
1 parent 7d7fc08 commit 4980b41

File tree

9 files changed

+72
-72
lines changed

9 files changed

+72
-72
lines changed

‎examples/chain_client/1_LocalOrderHash.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ async def main() -> None:
4141
fee_recipient = "inj1hkhdaj2a2clmq5jq6mspsggqs32vynpk228q3r"
4242

4343
spot_orders = [
44-
composer.create_v2_spot_order(
44+
composer.create_spot_order_v2(
4545
market_id=spot_market_id,
4646
subaccount_id=subaccount_id,
4747
fee_recipient=fee_recipient,
@@ -50,7 +50,7 @@ async def main() -> None:
5050
order_type="BUY",
5151
cid=str(uuid.uuid4()),
5252
),
53-
composer.create_v2_spot_order(
53+
composer.create_spot_order_v2(
5454
market_id=spot_market_id,
5555
subaccount_id=subaccount_id,
5656
fee_recipient=fee_recipient,
@@ -62,7 +62,7 @@ async def main() -> None:
6262
]
6363

6464
derivative_orders = [
65-
composer.create_v2_derivative_order(
65+
composer.create_derivative_order_v2(
6666
market_id=deriv_market_id,
6767
subaccount_id=subaccount_id,
6868
fee_recipient=fee_recipient,
@@ -74,7 +74,7 @@ async def main() -> None:
7474
order_type="BUY",
7575
cid=str(uuid.uuid4()),
7676
),
77-
composer.create_v2_derivative_order(
77+
composer.create_derivative_order_v2(
7878
market_id=deriv_market_id,
7979
subaccount_id=subaccount_id,
8080
fee_recipient=fee_recipient,

‎examples/chain_client/3_MessageBroadcaster.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ async def main() -> None:
3535
spot_market_id_create = "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe"
3636

3737
spot_orders_to_create = [
38-
composer.create_v2_spot_order(
38+
composer.create_spot_order_v2(
3939
market_id=spot_market_id_create,
4040
subaccount_id=subaccount_id,
4141
fee_recipient=fee_recipient,
@@ -44,7 +44,7 @@ async def main() -> None:
4444
order_type="BUY",
4545
cid=(str(uuid.uuid4())),
4646
),
47-
composer.create_v2_spot_order(
47+
composer.create_spot_order_v2(
4848
market_id=spot_market_id_create,
4949
subaccount_id=subaccount_id,
5050
fee_recipient=fee_recipient,

‎examples/chain_client/5_MessageBroadcasterWithoutSimulation.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ async def main() -> None:
3535
spot_market_id_create = "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe"
3636

3737
spot_orders_to_create = [
38-
composer.create_v2_spot_order(
38+
composer.create_spot_order_v2(
3939
market_id=spot_market_id_create,
4040
subaccount_id=subaccount_id,
4141
fee_recipient=fee_recipient,
@@ -44,7 +44,7 @@ async def main() -> None:
4444
order_type="BUY",
4545
cid=str(uuid.uuid4()),
4646
),
47-
composer.create_v2_spot_order(
47+
composer.create_spot_order_v2(
4848
market_id=spot_market_id_create,
4949
subaccount_id=subaccount_id,
5050
fee_recipient=fee_recipient,

‎examples/chain_client/exchange/19_MsgLiquidatePosition.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ async def main() -> None:
3737
fee_recipient = "inj1hkhdaj2a2clmq5jq6mspsggqs32vynpk228q3r"
3838
cid = str(uuid.uuid4())
3939

40-
order = composer.create_v2_derivative_order(
40+
order = composer.create_derivative_order_v2(
4141
market_id=market_id,
4242
subaccount_id=subaccount_id,
4343
fee_recipient=fee_recipient,

‎examples/chain_client/exchange/9_MsgBatchUpdateOrders.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,33 +44,33 @@ async def main() -> None:
4444
spot_market_id_cancel_2 = "0x7a57e705bb4e09c88aecfc295569481dbf2fe1d5efe364651fbe72385938e9b0"
4545

4646
derivative_orders_to_cancel = [
47-
composer.create_v2_order_data_without_mask(
47+
composer.create_order_data_without_mask_v2(
4848
market_id=derivative_market_id_cancel,
4949
subaccount_id=subaccount_id,
5050
order_hash="0x48690013c382d5dbaff9989db04629a16a5818d7524e027d517ccc89fd068103",
5151
),
52-
composer.create_v2_order_data_without_mask(
52+
composer.create_order_data_without_mask_v2(
5353
market_id=derivative_market_id_cancel_2,
5454
subaccount_id=subaccount_id,
5555
order_hash="0x7ee76255d7ca763c56b0eab9828fca89fdd3739645501c8a80f58b62b4f76da5",
5656
),
5757
]
5858

5959
spot_orders_to_cancel = [
60-
composer.create_v2_order_data_without_mask(
60+
composer.create_order_data_without_mask_v2(
6161
market_id=spot_market_id_cancel,
6262
subaccount_id=subaccount_id,
6363
cid="0e5c3ad5-2cc4-4a2a-bbe5-b12697739163",
6464
),
65-
composer.create_v2_order_data_without_mask(
65+
composer.create_order_data_without_mask_v2(
6666
market_id=spot_market_id_cancel_2,
6767
subaccount_id=subaccount_id,
6868
order_hash="0x222daa22f60fe9f075ed0ca583459e121c23e64431c3fbffdedda04598ede0d2",
6969
),
7070
]
7171

7272
derivative_orders_to_create = [
73-
composer.create_v2_derivative_order(
73+
composer.create_derivative_order_v2(
7474
market_id=derivative_market_id_create,
7575
subaccount_id=subaccount_id,
7676
fee_recipient=fee_recipient,
@@ -82,7 +82,7 @@ async def main() -> None:
8282
order_type="BUY",
8383
cid=str(uuid.uuid4()),
8484
),
85-
composer.create_v2_derivative_order(
85+
composer.create_derivative_order_v2(
8686
market_id=derivative_market_id_create,
8787
subaccount_id=subaccount_id,
8888
fee_recipient=fee_recipient,
@@ -97,7 +97,7 @@ async def main() -> None:
9797
]
9898

9999
spot_orders_to_create = [
100-
composer.create_v2_spot_order(
100+
composer.create_spot_order_v2(
101101
market_id=spot_market_id_create,
102102
subaccount_id=subaccount_id,
103103
fee_recipient=fee_recipient,
@@ -106,7 +106,7 @@ async def main() -> None:
106106
order_type="BUY",
107107
cid=str(uuid.uuid4()),
108108
),
109-
composer.create_v2_spot_order(
109+
composer.create_spot_order_v2(
110110
market_id=spot_market_id_create,
111111
subaccount_id=subaccount_id,
112112
fee_recipient=fee_recipient,

‎pyinjective/composer.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ def order_data_without_mask(
405405
cid=cid,
406406
)
407407

408-
def create_v2_order_data(
408+
def create_order_data_v2(
409409
self,
410410
market_id: str,
411411
subaccount_id: str,
@@ -425,7 +425,7 @@ def create_v2_order_data(
425425
cid=cid,
426426
)
427427

428-
def create_v2_order_data_without_mask(
428+
def create_order_data_without_mask_v2(
429429
self,
430430
market_id: str,
431431
subaccount_id: str,
@@ -479,7 +479,7 @@ def spot_order(
479479
trigger_price=chain_trigger_price,
480480
)
481481

482-
def create_v2_spot_order(
482+
def create_spot_order_v2(
483483
self,
484484
market_id: str,
485485
subaccount_id: str,
@@ -557,7 +557,7 @@ def derivative_order(
557557
chain_trigger_price=chain_trigger_price,
558558
)
559559

560-
def create_v2_derivative_order(
560+
def create_derivative_order_v2(
561561
self,
562562
market_id: str,
563563
subaccount_id: str,
@@ -571,7 +571,7 @@ def create_v2_derivative_order(
571571
) -> injective_order_v2_pb.DerivativeOrder:
572572
trigger_price = trigger_price or Decimal(0)
573573

574-
return self._basic_v2_derivative_order(
574+
return self._basic_derivative_order_v2(
575575
market_id=market_id,
576576
subaccount_id=subaccount_id,
577577
fee_recipient=fee_recipient,
@@ -622,7 +622,7 @@ def binary_options_order(
622622
chain_trigger_price=chain_trigger_price,
623623
)
624624

625-
def create_v2_binary_options_order(
625+
def create_binary_options_order_v2(
626626
self,
627627
market_id: str,
628628
subaccount_id: str,
@@ -636,7 +636,7 @@ def create_v2_binary_options_order(
636636
) -> injective_order_v2_pb.DerivativeOrder:
637637
trigger_price = trigger_price or Decimal(0)
638638

639-
return self._basic_v2_derivative_order(
639+
return self._basic_derivative_order_v2(
640640
market_id=market_id,
641641
subaccount_id=subaccount_id,
642642
fee_recipient=fee_recipient,
@@ -1113,7 +1113,7 @@ def msg_create_spot_limit_order_v2(
11131113
) -> injective_exchange_tx_v2_pb.MsgCreateSpotLimitOrder:
11141114
return injective_exchange_tx_v2_pb.MsgCreateSpotLimitOrder(
11151115
sender=sender,
1116-
order=self.create_v2_spot_order(
1116+
order=self.create_spot_order_v2(
11171117
market_id=market_id,
11181118
subaccount_id=subaccount_id,
11191119
fee_recipient=fee_recipient,
@@ -1189,7 +1189,7 @@ def msg_create_spot_market_order_v2(
11891189
) -> injective_exchange_tx_v2_pb.MsgCreateSpotMarketOrder:
11901190
return injective_exchange_tx_v2_pb.MsgCreateSpotMarketOrder(
11911191
sender=sender,
1192-
order=self.create_v2_spot_order(
1192+
order=self.create_spot_order_v2(
11931193
market_id=market_id,
11941194
subaccount_id=subaccount_id,
11951195
fee_recipient=fee_recipient,
@@ -1404,7 +1404,7 @@ def msg_create_derivative_limit_order_v2(
14041404
) -> injective_exchange_tx_v2_pb.MsgCreateDerivativeLimitOrder:
14051405
return injective_exchange_tx_v2_pb.MsgCreateDerivativeLimitOrder(
14061406
sender=sender,
1407-
order=self.create_v2_derivative_order(
1407+
order=self.create_derivative_order_v2(
14081408
market_id=market_id,
14091409
subaccount_id=subaccount_id,
14101410
fee_recipient=fee_recipient,
@@ -1493,7 +1493,7 @@ def msg_create_derivative_market_order_v2(
14931493
) -> injective_exchange_tx_v2_pb.MsgCreateDerivativeMarketOrder:
14941494
return injective_exchange_tx_v2_pb.MsgCreateDerivativeMarketOrder(
14951495
sender=sender,
1496-
order=self.create_v2_derivative_order(
1496+
order=self.create_derivative_order_v2(
14971497
market_id=market_id,
14981498
subaccount_id=subaccount_id,
14991499
fee_recipient=fee_recipient,
@@ -1730,7 +1730,7 @@ def msg_create_binary_options_limit_order_v2(
17301730
) -> injective_exchange_tx_v2_pb.MsgCreateDerivativeLimitOrder:
17311731
return injective_exchange_tx_v2_pb.MsgCreateDerivativeLimitOrder(
17321732
sender=sender,
1733-
order=self.create_v2_binary_options_order(
1733+
order=self.create_binary_options_order_v2(
17341734
market_id=market_id,
17351735
subaccount_id=subaccount_id,
17361736
fee_recipient=fee_recipient,
@@ -1798,7 +1798,7 @@ def msg_create_binary_options_market_order_v2(
17981798
) -> injective_exchange_tx_v2_pb.MsgCreateBinaryOptionsMarketOrder:
17991799
return injective_exchange_tx_v2_pb.MsgCreateBinaryOptionsMarketOrder(
18001800
sender=sender,
1801-
order=self.create_v2_binary_options_order(
1801+
order=self.create_binary_options_order_v2(
18021802
market_id=market_id,
18031803
subaccount_id=subaccount_id,
18041804
fee_recipient=fee_recipient,
@@ -3056,7 +3056,7 @@ def _basic_derivative_order(
30563056
trigger_price=formatted_trigger_price,
30573057
)
30583058

3059-
def _basic_v2_derivative_order(
3059+
def _basic_derivative_order_v2(
30603060
self,
30613061
market_id: str,
30623062
subaccount_id: str,

0 commit comments

Comments
 (0)