Merge pull request #312 from InjectiveLabs/fix/remove_deprecated_methods_from_examples

Fix/remove deprecated methods from examples

Author: aarmoa

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.4.1] - 2024-03-12
+### Changed
+- Updates example scripts that were still using deprecated methods
+
 ## [1.4.0] - 2024-03-11
 ### Added
 - Added support for all queries and messages in the chain 'distribution' module

examples/chain_client/3_MessageBroadcaster.py

@@ -56,7 +56,7 @@ async def main() -> None:
     ]
 
     # prepare tx msg
-    msg = composer.MsgBatchUpdateOrders(
+    msg = composer.msg_batch_update_orders(
         sender=address.to_acc_bech32(),
         spot_orders_to_create=spot_orders_to_create,
     )

examples/chain_client/5_MessageBroadcasterWithoutSimulation.py

@@ -56,7 +56,7 @@ async def main() -> None:
     ]
 
     # prepare tx msg
-    msg = composer.MsgBatchUpdateOrders(
+    msg = composer.msg_batch_update_orders(
         sender=address.to_acc_bech32(),
         spot_orders_to_create=spot_orders_to_create,
     )

examples/chain_client/exchange/8_MsgCancelSpotOrder.py

@@ -35,7 +35,7 @@ async def main() -> None:
     order_hash = "0x52888d397d5ae821869c8acde5823dfd8018802d2ef642d3aa639e5308173fcf"
 
     # prepare tx msg
-    msg = composer.MsgCancelSpotOrder(
+    msg = composer.msg_cancel_spot_order(
         sender=address.to_acc_bech32(), market_id=market_id, subaccount_id=subaccount_id, order_hash=order_hash
     )
 

examples/chain_client/exchange/9_MsgBatchUpdateOrders.py

@@ -118,7 +118,7 @@ async def main() -> None:
     ]
 
     # prepare tx msg
-    msg = composer.MsgBatchUpdateOrders(
+    msg = composer.msg_batch_update_orders(
         sender=address.to_acc_bech32(),
         derivative_orders_to_create=derivative_orders_to_create,
         spot_orders_to_create=spot_orders_to_create,

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "injective-py"
-version = "1.4.0"
+version = "1.4.1"
 description = "Injective Python SDK, with Exchange API Client"
 authors = ["Injective Labs <contact@injectivelabs.org>"]
 license = "Apache-2.0"

tests/core/test_gas_limit_estimator.py

@@ -157,7 +157,7 @@ def test_estimation_for_batch_update_orders_to_create_spot_orders(self):
                 order_type="BUY",
             ),
         ]
-        message = composer.MsgBatchUpdateOrders(
+        message = composer.msg_batch_update_orders(
             sender="senders",
             derivative_orders_to_create=[],
             spot_orders_to_create=orders,
@@ -194,7 +194,7 @@ def test_estimation_for_batch_update_orders_to_create_derivative_orders(self):
                 order_type="SELL",
             ),
         ]
-        message = composer.MsgBatchUpdateOrders(
+        message = composer.msg_batch_update_orders(
             sender="senders",
             derivative_orders_to_create=orders,
             spot_orders_to_create=[],
@@ -249,7 +249,7 @@ def test_estimation_for_batch_update_orders_to_create_binary_orders(self, usdt_t
                 order_type="SELL",
             ),
         ]
-        message = composer.MsgBatchUpdateOrders(
+        message = composer.msg_batch_update_orders(
             sender="senders",
             derivative_orders_to_create=[],
             spot_orders_to_create=[],
@@ -284,7 +284,7 @@ def test_estimation_for_batch_update_orders_to_cancel_spot_orders(self):
                 order_hash="0x7ee76255d7ca763c56b0eab9828fca89fdd3739645501c8a80f58b62b4f76da5",
             ),
         ]
-        message = composer.MsgBatchUpdateOrders(
+        message = composer.msg_batch_update_orders(
             sender="senders",
             derivative_orders_to_create=[],
             spot_orders_to_create=[],
@@ -318,7 +318,7 @@ def test_estimation_for_batch_update_orders_to_cancel_derivative_orders(self):
                 order_hash="0x7ee76255d7ca763c56b0eab9828fca89fdd3739645501c8a80f58b62b4f76da5",
             ),
         ]
-        message = composer.MsgBatchUpdateOrders(
+        message = composer.msg_batch_update_orders(
             sender="senders",
             derivative_orders_to_create=[],
             spot_orders_to_create=[],
@@ -352,7 +352,7 @@ def test_estimation_for_batch_update_orders_to_cancel_binary_orders(self):
                 order_hash="0x7ee76255d7ca763c56b0eab9828fca89fdd3739645501c8a80f58b62b4f76da5",
             ),
         ]
-        message = composer.MsgBatchUpdateOrders(
+        message = composer.msg_batch_update_orders(
             sender="senders",
             derivative_orders_to_create=[],
             spot_orders_to_create=[],
@@ -371,7 +371,7 @@ def test_estimation_for_batch_update_orders_to_cancel_all_for_spot_market(self):
         market_id = "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe"
         composer = Composer(network="testnet")
 
-        message = composer.MsgBatchUpdateOrders(
+        message = composer.msg_batch_update_orders(
             sender="senders",
             subaccount_id="subaccount_id",
             spot_market_ids_to_cancel_all=[market_id],
@@ -391,7 +391,7 @@ def test_estimation_for_batch_update_orders_to_cancel_all_for_derivative_market(
         market_id = "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe"
         composer = Composer(network="testnet")
 
-        message = composer.MsgBatchUpdateOrders(
+        message = composer.msg_batch_update_orders(
             sender="senders",
             subaccount_id="subaccount_id",
             derivative_market_ids_to_cancel_all=[market_id],
@@ -411,7 +411,7 @@ def test_estimation_for_batch_update_orders_to_cancel_all_for_binary_options_mar
         market_id = "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe"
         composer = Composer(network="testnet")
 
-        message = composer.MsgBatchUpdateOrders(
+        message = composer.msg_batch_update_orders(
             sender="senders",
             subaccount_id="subaccount_id",
             binary_options_market_ids_to_cancel_all=[market_id],
@@ -440,7 +440,7 @@ def test_estimation_for_exec_message(self):
                 order_type="BUY",
             ),
         ]
-        inner_message = composer.MsgBatchUpdateOrders(
+        inner_message = composer.msg_batch_update_orders(
             sender="senders",
             derivative_orders_to_create=[],
             spot_orders_to_create=orders,

tests/test_async_client_deprecation_warnings.py

@@ -537,24 +537,6 @@ async def test_stream_keepalive_deprecation_warning(
         assert len(deprecation_warnings) == 1
         assert str(deprecation_warnings[0].message) == "This method is deprecated. Use listen_keepalive instead"
 
-    @pytest.mark.asyncio
-    async def test_oracle_list_deprecation_warning(
-        self,
-        oracle_servicer,
-    ):
-        client = AsyncClient(
-            network=Network.local(),
-        )
-        client.stubOracle = oracle_servicer
-        oracle_servicer.oracle_list_responses.append(exchange_oracle_pb.OracleListResponse())
-
-        with catch_warnings(record=True) as all_warnings:
-            await client.get_oracle_list()
-
-        deprecation_warnings = [warning for warning in all_warnings if issubclass(warning.category, DeprecationWarning)]
-        assert len(deprecation_warnings) == 1
-        assert str(deprecation_warnings[0].message) == "This method is deprecated. Use fetch_oracle_list instead"
-
     @pytest.mark.asyncio
     async def test_get_oracle_list_deprecation_warning(
         self,

tests/test_composer_deprecation_warnings.py

@@ -50,7 +50,20 @@ def test_msg_withdraw_deprecation_warning(self):
         assert len(deprecation_warnings) == 1
         assert str(deprecation_warnings[0].message) == "This method is deprecated. Use msg_withdraw instead"
 
-    def teste_order_data_deprecation_warning(self):
+    def test_coin_deprecation_warning(self):
+        composer = Composer(network=Network.devnet().string())
+
+        with warnings.catch_warnings(record=True) as all_warnings:
+            composer.Coin(
+                amount=1,
+                denom="INJ",
+            )
+
+        deprecation_warnings = [warning for warning in all_warnings if issubclass(warning.category, DeprecationWarning)]
+        assert len(deprecation_warnings) == 1
+        assert str(deprecation_warnings[0].message) == "This method is deprecated. Use coin instead"
+
+    def test_order_data_deprecation_warning(self):
         composer = Composer(network=Network.devnet().string())
 
         with warnings.catch_warnings(record=True) as all_warnings:
@@ -520,3 +533,19 @@ def test_msg_admin_update_binary_options_market_deprecation_warning(self, basic_
             str(deprecation_warnings[0].message)
             == "This method is deprecated. Use msg_admin_update_binary_options_market instead"
         )
+
+    def test_msg_withdraw_delegator_reward_deprecation_warning(self):
+        composer = Composer(network=Network.devnet().string())
+
+        with warnings.catch_warnings(record=True) as all_warnings:
+            composer.MsgWithdrawDelegatorReward(
+                delegator_address="delegator address",
+                validator_address="validator address",
+            )
+
+        deprecation_warnings = [warning for warning in all_warnings if issubclass(warning.category, DeprecationWarning)]
+        assert len(deprecation_warnings) == 1
+        assert (
+            str(deprecation_warnings[0].message)
+            == "This method is deprecated. Use msg_withdraw_delegator_reward instead"
+        )