|
11 | 11 | from dydx_v4_client.node.message import subaccount, send_token, order |
12 | 12 | from v4_proto.dydxprotocol.clob.order_pb2 import Order |
13 | 13 | from dydx_v4_client.indexer.rest.constants import OrderType |
14 | | -from tests.conftest import get_wallet, assert_successful_broadcast, TEST_ADDRESS_2 |
| 14 | +from tests.conftest import ( |
| 15 | + get_wallet, |
| 16 | + assert_successful_broadcast, |
| 17 | + TEST_ADDRESS_2, |
| 18 | + TEST_MARKET_ID, |
| 19 | +) |
15 | 20 | from v4_proto.dydxprotocol.clob.order_pb2 import BuilderCodeParameters |
16 | 21 | from dydx_v4_client.indexer.rest.constants import OrderStatus |
17 | 22 | from dydx_v4_client.key_pair import KeyPair |
18 | 23 |
|
19 | 24 |
|
20 | 25 | REQUEST_PROCESSING_TIME = 5 |
21 | | -MARKET_ID = "ENA-USD" |
22 | 26 | SUBACCOUNT = 0 |
23 | 27 |
|
24 | 28 |
|
@@ -211,7 +215,7 @@ async def test_query_address(node_client, test_address): |
211 | 215 |
|
212 | 216 | @pytest.mark.asyncio |
213 | 217 | async def test_create_market_permissionless(node_client, wallet, test_address): |
214 | | - ticker = "ENA-USD" |
| 218 | + ticker = TEST_MARKET_ID |
215 | 219 | try: |
216 | 220 | response = await node_client.create_market_permissionless( |
217 | 221 | wallet, ticker, test_address, 0 |
@@ -334,9 +338,9 @@ async def test_place_order_with_twap_parameters( |
334 | 338 | node_client, indexer_rest_client, test_address, wallet, liquidity_setup, key_pair |
335 | 339 | ): |
336 | 340 | market = Market( |
337 | | - (await indexer_rest_client.markets.get_perpetual_markets(MARKET_ID))["markets"][ |
338 | | - MARKET_ID |
339 | | - ] |
| 341 | + (await indexer_rest_client.markets.get_perpetual_markets(TEST_MARKET_ID))[ |
| 342 | + "markets" |
| 343 | + ][TEST_MARKET_ID] |
340 | 344 | ) |
341 | 345 | wallet = await get_wallet(node_client, key_pair, test_address) |
342 | 346 |
|
@@ -378,9 +382,9 @@ async def test_close_position_sell_no_reduce_by( |
378 | 382 | node_client, wallet, test_address, indexer_rest_client, liquidity_setup, key_pair |
379 | 383 | ): |
380 | 384 | market = Market( |
381 | | - (await indexer_rest_client.markets.get_perpetual_markets(MARKET_ID))["markets"][ |
382 | | - MARKET_ID |
383 | | - ] |
| 385 | + (await indexer_rest_client.markets.get_perpetual_markets(TEST_MARKET_ID))[ |
| 386 | + "markets" |
| 387 | + ][TEST_MARKET_ID] |
384 | 388 | ) |
385 | 389 |
|
386 | 390 | wallet = await get_wallet(node_client, key_pair, test_address) |
@@ -452,7 +456,7 @@ async def setup_liquidity_orders(node_client, indexer_rest_client, wallet_2, mar |
452 | 456 | # Fetch orderbook to get current bid/ask |
453 | 457 | try: |
454 | 458 | orderbook = await indexer_rest_client.markets.get_perpetual_market_orderbook( |
455 | | - MARKET_ID |
| 459 | + TEST_MARKET_ID |
456 | 460 | ) |
457 | 461 | best_bid = ( |
458 | 462 | float(orderbook["bids"][0]["price"]) |
@@ -587,9 +591,9 @@ async def liquidity_setup(node_client, indexer_rest_client, wallet_2, key_pair_2 |
587 | 591 | Places buy and sell orders at ±0.1% from oracle price using TEST_ADDRESS_2. |
588 | 592 | """ |
589 | 593 | market = Market( |
590 | | - (await indexer_rest_client.markets.get_perpetual_markets(MARKET_ID))["markets"][ |
591 | | - MARKET_ID |
592 | | - ] |
| 594 | + (await indexer_rest_client.markets.get_perpetual_markets(TEST_MARKET_ID))[ |
| 595 | + "markets" |
| 596 | + ][TEST_MARKET_ID] |
593 | 597 | ) |
594 | 598 |
|
595 | 599 | # Setup: place liquidity orders |
@@ -618,9 +622,9 @@ async def test_close_position_sell_having_reduce_by( |
618 | 622 | node_client, wallet, test_address, indexer_rest_client, liquidity_setup, key_pair |
619 | 623 | ): |
620 | 624 | market = Market( |
621 | | - (await indexer_rest_client.markets.get_perpetual_markets(MARKET_ID))["markets"][ |
622 | | - MARKET_ID |
623 | | - ] |
| 625 | + (await indexer_rest_client.markets.get_perpetual_markets(TEST_MARKET_ID))[ |
| 626 | + "markets" |
| 627 | + ][TEST_MARKET_ID] |
624 | 628 | ) |
625 | 629 |
|
626 | 630 | wallet = await get_wallet(node_client, key_pair, test_address) |
@@ -691,9 +695,9 @@ async def test_close_position_buy_no_reduce_by( |
691 | 695 | node_client, wallet, test_address, indexer_rest_client, liquidity_setup, key_pair |
692 | 696 | ): |
693 | 697 | market = Market( |
694 | | - (await indexer_rest_client.markets.get_perpetual_markets(MARKET_ID))["markets"][ |
695 | | - MARKET_ID |
696 | | - ] |
| 698 | + (await indexer_rest_client.markets.get_perpetual_markets(TEST_MARKET_ID))[ |
| 699 | + "markets" |
| 700 | + ][TEST_MARKET_ID] |
697 | 701 | ) |
698 | 702 |
|
699 | 703 | wallet = await get_wallet(node_client, key_pair, test_address) |
@@ -759,9 +763,9 @@ async def test_close_position_buy_having_reduce_by( |
759 | 763 | node_client, wallet, test_address, indexer_rest_client, liquidity_setup, key_pair |
760 | 764 | ): |
761 | 765 | market = Market( |
762 | | - (await indexer_rest_client.markets.get_perpetual_markets(MARKET_ID))["markets"][ |
763 | | - MARKET_ID |
764 | | - ] |
| 766 | + (await indexer_rest_client.markets.get_perpetual_markets(TEST_MARKET_ID))[ |
| 767 | + "markets" |
| 768 | + ][TEST_MARKET_ID] |
765 | 769 | ) |
766 | 770 |
|
767 | 771 | wallet = await get_wallet(node_client, key_pair, test_address) |
@@ -828,9 +832,9 @@ async def test_close_position_slippage_pct_raise_exception( |
828 | 832 | node_client, wallet, test_address, indexer_rest_client |
829 | 833 | ): |
830 | 834 | market = Market( |
831 | | - (await indexer_rest_client.markets.get_perpetual_markets(MARKET_ID))["markets"][ |
832 | | - MARKET_ID |
833 | | - ] |
| 835 | + (await indexer_rest_client.markets.get_perpetual_markets(TEST_MARKET_ID))[ |
| 836 | + "markets" |
| 837 | + ][TEST_MARKET_ID] |
834 | 838 | ) |
835 | 839 | with pytest.raises(ValueError): |
836 | 840 | _ = await node_client.close_position( |
@@ -872,9 +876,11 @@ async def get_current_order_size( |
872 | 876 | return None |
873 | 877 | if "openPerpetualPositions" not in subaccount["subaccount"]: |
874 | 878 | return None |
875 | | - if "ENA-USD" not in subaccount["subaccount"]["openPerpetualPositions"]: |
| 879 | + if TEST_MARKET_ID not in subaccount["subaccount"]["openPerpetualPositions"]: |
876 | 880 | return None |
877 | | - return float(subaccount["subaccount"]["openPerpetualPositions"]["ENA-USD"]["size"]) |
| 881 | + return float( |
| 882 | + subaccount["subaccount"]["openPerpetualPositions"][TEST_MARKET_ID]["size"] |
| 883 | + ) |
878 | 884 |
|
879 | 885 |
|
880 | 886 | async def close_open_positions( |
|
0 commit comments