Merge branch 'staging' into fix/e2e-test-incentive

Author: ibraheem-abe

bittensor/core/async_subtensor.py

@@ -999,7 +999,7 @@ async def get_all_commitments(
         )
         result = {}
         async for id_, value in query:
-            result[decode_account_id(id_[0])] = decode_account_id(value)
+            result[decode_account_id(id_[0])] = decode_metadata(value)
         return result
 
     async def get_current_weight_commit_info(

bittensor/core/extrinsics/asyncex/staking.py

@@ -314,20 +314,6 @@ async def add_stake_multiple_extrinsic(
             if staking_response is True:  # If we successfully staked.
                 # We only wait here if we expect finalization.
 
-                if idx < len(hotkey_ss58s) - 1:
-                    # Wait for tx rate limit.
-                    tx_query = await subtensor.substrate.query(
-                        module="SubtensorModule", storage_function="TxRateLimit"
-                    )
-                    tx_rate_limit_blocks: int = getattr(tx_query, "value", 0)
-                    if tx_rate_limit_blocks > 0:
-                        logging.error(
-                            f":hourglass: [yellow]Waiting for tx rate limit: [white]{tx_rate_limit_blocks}[/white] "
-                            f"blocks[/yellow]"
-                        )
-                        # 12 seconds per block
-                        await asyncio.sleep(tx_rate_limit_blocks * 12)
-
                 if not wait_for_finalization and not wait_for_inclusion:
                     old_balance -= staking_balance
                     successful_stakes += 1

bittensor/core/extrinsics/asyncex/unstaking.py

@@ -281,18 +281,6 @@ async def unstake_multiple_extrinsic(
             if staking_response is True:  # If we successfully unstaked.
                 # We only wait here if we expect finalization.
 
-                if idx < len(hotkey_ss58s) - 1:
-                    # Wait for tx rate limit.
-                    tx_rate_limit_blocks = await subtensor.tx_rate_limit()
-                    if tx_rate_limit_blocks > 0:
-                        logging.info(
-                            f":hourglass: [yellow]Waiting for tx rate limit: "
-                            f"[white]{tx_rate_limit_blocks}[/white] blocks[/yellow]"
-                        )
-                        await asyncio.sleep(
-                            tx_rate_limit_blocks * 12
-                        )  # 12 seconds per block
-
                 if not wait_for_finalization and not wait_for_inclusion:
                     successful_unstakes += 1
                     continue

bittensor/core/extrinsics/unstaking.py

@@ -1,4 +1,3 @@
-import time
 from typing import Optional, TYPE_CHECKING
 
 from bittensor.core.errors import StakeError, NotRegisteredError
@@ -266,16 +265,6 @@ def unstake_multiple_extrinsic(
             if staking_response is True:  # If we successfully unstaked.
                 # We only wait here if we expect finalization.
 
-                if idx < len(hotkey_ss58s) - 1:
-                    # Wait for tx rate limit.
-                    tx_rate_limit_blocks = subtensor.tx_rate_limit()
-                    if tx_rate_limit_blocks > 0:
-                        logging.info(
-                            f":hourglass: [yellow]Waiting for tx rate limit: "
-                            f"[white]{tx_rate_limit_blocks}[/white] blocks[/yellow]"
-                        )
-                        time.sleep(tx_rate_limit_blocks * 12)  # 12 seconds per block
-
                 if not wait_for_finalization and not wait_for_inclusion:
                     successful_unstakes += 1
                     continue

bittensor/core/subtensor.py

@@ -754,7 +754,7 @@ def get_all_commitments(
         )
         result = {}
         for id_, value in query:
-            result[decode_account_id(id_[0])] = decode_account_id(value)
+            result[decode_account_id(id_[0])] = decode_metadata(value)
         return result
 
     def get_current_weight_commit_info(

tests/e2e_tests/conftest.py

@@ -8,8 +8,9 @@
 
 import pytest
 from async_substrate_interface import SubstrateInterface
-from bittensor.core.subtensor import Subtensor
 
+from bittensor.core.async_subtensor import AsyncSubtensor
+from bittensor.core.subtensor import Subtensor
 from bittensor.utils.btlogging import logging
 from tests.e2e_tests.utils.e2e_test_utils import (
     Templates,
@@ -101,6 +102,11 @@ def subtensor(local_chain):
     return Subtensor(network="ws://localhost:9944")
 
 
+@pytest.fixture
+def async_subtensor(local_chain):
+    return AsyncSubtensor(network="ws://localhost:9944")
+
+
 @pytest.fixture
 def alice_wallet():
     keypair, wallet = setup_wallet("//Alice")

tests/e2e_tests/test_commitment.py

@@ -51,3 +51,61 @@ def test_commitment(subtensor, alice_wallet):
         netuid=1,
         uid=uid,
     )
+
+    assert (
+        subtensor.get_all_commitments(netuid=1)[alice_wallet.hotkey.ss58_address]
+        == "Hello World!"
+    )
+
+
+@pytest.mark.asyncio
+async def test_commitment_async(async_subtensor, alice_wallet):
+    async with async_subtensor as sub:
+        with pytest.raises(SubstrateRequestException, match="AccountNotAllowedCommit"):
+            await sub.set_commitment(
+                alice_wallet,
+                netuid=1,
+                data="Hello World!",
+            )
+
+        assert await sub.burned_register(
+            alice_wallet,
+            netuid=1,
+        )
+
+        uid = await sub.get_uid_for_hotkey_on_subnet(
+            alice_wallet.hotkey.ss58_address,
+            netuid=1,
+        )
+
+        assert uid is not None
+
+        assert "" == await sub.get_commitment(
+            netuid=1,
+            uid=uid,
+        )
+
+        assert await sub.set_commitment(
+            alice_wallet,
+            netuid=1,
+            data="Hello World!",
+        )
+
+        with pytest.raises(
+            SubstrateRequestException,
+            match="CommitmentSetRateLimitExceeded",
+        ):
+            await sub.set_commitment(
+                alice_wallet,
+                netuid=1,
+                data="Hello World!",
+            )
+
+        assert "Hello World!" == await sub.get_commitment(
+            netuid=1,
+            uid=uid,
+        )
+
+        assert (await sub.get_all_commitments(netuid=1))[
+            alice_wallet.hotkey.ss58_address
+        ] == "Hello World!"

tests/unit_tests/test_config.py

@@ -4,7 +4,6 @@
 
 def test_py_config_parsed_successfully_rust_wallet():
     """Verify that python based config object is successfully parsed with rust-based wallet object."""
-    # Preps
     parser = argparse.ArgumentParser()
 
     bittensor.wallet.add_args(parser)
@@ -14,7 +13,7 @@ def test_py_config_parsed_successfully_rust_wallet():
 
     config = bittensor.config(parser)
 
-    # since we can't apply mocking to rust implewmented object then replace those directly
+    # override config manually since we can't apply mocking to rust objects easily
     config.wallet.name = "new_wallet_name"
     config.wallet.hotkey = "new_hotkey"
     config.wallet.path = "/some/not_default/path"