Merge pull request #2830 from opentensor/fix/roman/e2e-relared-with-start-call

Fix and improve e2e tests after `start call` new limit in subtensor

Author: basfroman

.circleci/config.yml

@@ -39,7 +39,7 @@ jobs:
             python -m venv .venv
             . .venv/bin/activate
             python -m pip install --upgrade uv
-            uv pip install ruff
+            uv pip install ruff==0.11.5
 
       - save_cache:
           name: Save cached ruff venv

.github/workflows/e2e-subtensor-tests.yaml

@@ -41,7 +41,7 @@ jobs:
           test_files=$(find tests/e2e_tests -name "test*.py" | jq -R -s -c 'split("\n") | map(select(. != ""))')
           # keep it here for future debug
           # test_files=$(find tests/e2e_tests -type f -name "test*.py" | grep -E 'test_(incentive|commit_weights|set_weights)\.py$' | jq -R -s -c 'split("\n") | map(select(. != ""))')
-          echo "::set-output name=test-files::$test_files"
+          echo "test-files=$test_files" >> "$GITHUB_OUTPUT"
         shell: bash
 
   pull-docker-image:
@@ -101,5 +101,26 @@ jobs:
       - name: Load Docker Image
         run: docker load -i subtensor-localnet.tar
 
-      - name: Run tests
-        run: uv run pytest ${{ matrix.test-file }} -s
+#      - name: Run tests
+#        run: uv run pytest ${{ matrix.test-file }} -s
+
+      - name: Run tests with retry
+        run: |
+          set +e
+          for i in 1 2; do
+            echo "🔁 Attempt $i: Running tests"
+            uv run pytest ${{ matrix.test-file }} -s
+            status=$?
+            if [ $status -eq 0 ]; then
+              echo "✅ Tests passed on attempt $i"
+              break
+            else
+              echo "❌ Tests failed on attempt $i"
+              if [ $i -eq 2 ]; then
+                echo "Tests failed after 2 attempts"
+                exit 1
+              fi
+              echo "Retrying..."
+              sleep 5
+            fi
+          done

bittensor/core/async_subtensor.py

@@ -753,6 +753,7 @@ async def does_hotkey_exist(
         return_val = (
             False
             if result is None
+            # not the default key (0x0)
             else result != "5C4hrfjw9DjXZTzV3MwzrrAr9P1MJhSrvWGWqi1eSuyUpnhM"
         )
         return return_val

bittensor/core/extrinsics/asyncex/start_call.py

@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING
 
-from bittensor.utils import unlock_key
+from bittensor.utils import unlock_key, format_error_message
 from bittensor.utils.btlogging import logging
 
 if TYPE_CHECKING:
@@ -58,4 +58,4 @@ async def start_call_extrinsic(
         if await response.is_success:
             return True, "Success with `start_call` response."
 
-        return False, await response.error_message
+        return False, format_error_message(await response.error_message)

bittensor/core/extrinsics/start_call.py

@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING
 
-from bittensor.utils import unlock_key
+from bittensor.utils import unlock_key, format_error_message
 from bittensor.utils.btlogging import logging
 
 if TYPE_CHECKING:
@@ -59,4 +59,4 @@ def start_call_extrinsic(
         if response.is_success:
             return True, "Success with `start_call` response."
 
-        return False, response.error_message
+        return False, format_error_message(response.error_message)

bittensor/core/subtensor.py

@@ -517,6 +517,7 @@ def does_hotkey_exist(self, hotkey_ss58: str, block: Optional[int] = None) -> bo
         return_val = (
             False
             if result is None
+            # not the default key (0x0)
             else result != "5C4hrfjw9DjXZTzV3MwzrrAr9P1MJhSrvWGWqi1eSuyUpnhM"
         )
         return return_val

tests/e2e_tests/test_commit_reveal_v3.py

@@ -13,7 +13,7 @@
 )
 
 
-@pytest.mark.parametrize("local_chain", [True], indirect=True)
+# @pytest.mark.parametrize("local_chain", [True], indirect=True)
 @pytest.mark.asyncio
 async def test_commit_and_reveal_weights_cr3(local_chain, subtensor, alice_wallet):
     """
@@ -149,7 +149,7 @@ async def test_commit_and_reveal_weights_cr3(local_chain, subtensor, alice_walle
     )
 
     # Ensure the expected drand round is well in the future
-    assert expected_reveal_round >= latest_drand_round, (
+    assert expected_reveal_round >= latest_drand_round + 1, (
         "Revealed drand pulse is older than the drand pulse right after setting weights"
     )
 

tests/e2e_tests/test_commitment.py

@@ -3,38 +3,47 @@
 
 from bittensor import logging
 from tests.e2e_tests.utils.chain_interactions import sudo_set_admin_utils
+from tests.e2e_tests.utils.e2e_test_utils import wait_to_start_call
 
 logging.set_trace()
 
 
-def test_commitment(local_chain, subtensor, alice_wallet):
+def test_commitment(local_chain, subtensor, alice_wallet, dave_wallet):
+    dave_subnet_netuid = 2
+    assert subtensor.register_subnet(dave_wallet, True, True)
+    assert subtensor.subnet_exists(dave_subnet_netuid), (
+        "Subnet wasn't created successfully"
+    )
+
+    assert wait_to_start_call(subtensor, dave_wallet, dave_subnet_netuid, 10)
+
     with pytest.raises(SubstrateRequestException, match="AccountNotAllowedCommit"):
         subtensor.set_commitment(
             alice_wallet,
-            netuid=1,
+            netuid=dave_subnet_netuid,
             data="Hello World!",
         )
 
     assert subtensor.burned_register(
         alice_wallet,
-        netuid=1,
+        netuid=dave_subnet_netuid,
     )
 
     uid = subtensor.get_uid_for_hotkey_on_subnet(
         alice_wallet.hotkey.ss58_address,
-        netuid=1,
+        netuid=dave_subnet_netuid,
     )
 
     assert uid is not None
 
     assert "" == subtensor.get_commitment(
-        netuid=1,
+        netuid=dave_subnet_netuid,
         uid=uid,
     )
 
     assert subtensor.set_commitment(
         alice_wallet,
-        netuid=1,
+        netuid=dave_subnet_netuid,
         data="Hello World!",
     )
 
@@ -44,7 +53,7 @@ def test_commitment(local_chain, subtensor, alice_wallet):
         call_module="Commitments",
         call_function="set_max_space",
         call_params={
-            "netuid": 1,
+            "netuid": dave_subnet_netuid,
             "new_limit": len("Hello World!"),
         },
     )
@@ -57,51 +66,67 @@ def test_commitment(local_chain, subtensor, alice_wallet):
     ):
         subtensor.set_commitment(
             alice_wallet,
-            netuid=1,
+            netuid=dave_subnet_netuid,
             data="Hello World!1",
         )
 
     assert "Hello World!" == subtensor.get_commitment(
-        netuid=1,
+        netuid=dave_subnet_netuid,
         uid=uid,
     )
 
     assert (
-        subtensor.get_all_commitments(netuid=1)[alice_wallet.hotkey.ss58_address]
+        subtensor.get_all_commitments(netuid=dave_subnet_netuid)[
+            alice_wallet.hotkey.ss58_address
+        ]
         == "Hello World!"
     )
 
 
 @pytest.mark.asyncio
-async def test_commitment_async(local_chain, async_subtensor, alice_wallet):
+async def test_commitment_async(
+    local_chain, async_subtensor, alice_wallet, dave_wallet
+):
+    dave_subnet_netuid = 2
+    assert await async_subtensor.register_subnet(dave_wallet)
+    assert await async_subtensor.subnet_exists(dave_subnet_netuid), (
+        "Subnet wasn't created successfully"
+    )
+
+    await async_subtensor.wait_for_block(await async_subtensor.block + 20)
+    status, message = await async_subtensor.start_call(
+        dave_wallet, dave_subnet_netuid, True, True
+    )
+    assert status, message
+
     async with async_subtensor as sub:
         with pytest.raises(SubstrateRequestException, match="AccountNotAllowedCommit"):
             await sub.set_commitment(
                 alice_wallet,
-                netuid=1,
+                netuid=dave_subnet_netuid,
                 data="Hello World!",
             )
 
         assert await sub.burned_register(
             alice_wallet,
-            netuid=1,
+            netuid=dave_subnet_netuid,
         )
 
         uid = await sub.get_uid_for_hotkey_on_subnet(
             alice_wallet.hotkey.ss58_address,
-            netuid=1,
+            netuid=dave_subnet_netuid,
         )
 
         assert uid is not None
 
         assert "" == await sub.get_commitment(
-            netuid=1,
+            netuid=dave_subnet_netuid,
             uid=uid,
         )
 
         assert await sub.set_commitment(
             alice_wallet,
-            netuid=1,
+            netuid=dave_subnet_netuid,
             data="Hello World!",
         )
 
@@ -111,7 +136,7 @@ async def test_commitment_async(local_chain, async_subtensor, alice_wallet):
             call_module="Commitments",
             call_function="set_max_space",
             call_params={
-                "netuid": 1,
+                "netuid": dave_subnet_netuid,
                 "new_limit": len("Hello World!"),
             },
         )
@@ -124,15 +149,15 @@ async def test_commitment_async(local_chain, async_subtensor, alice_wallet):
         ):
             await sub.set_commitment(
                 alice_wallet,
-                netuid=1,
+                netuid=dave_subnet_netuid,
                 data="Hello World!1",
             )
 
         assert "Hello World!" == await sub.get_commitment(
-            netuid=1,
+            netuid=dave_subnet_netuid,
             uid=uid,
         )
 
-        assert (await sub.get_all_commitments(netuid=1))[
+        assert (await sub.get_all_commitments(netuid=dave_subnet_netuid))[
             alice_wallet.hotkey.ss58_address
         ] == "Hello World!"