apply helper to e2e tests

Author: Roman

tests/e2e_tests/test_commitment.py

@@ -3,20 +3,19 @@
 
 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, dave_wallet):
     dave_subnet_netuid = 2
-    assert subtensor.register_subnet(dave_wallet)
+    assert subtensor.register_subnet(dave_wallet, True, True)
     assert subtensor.subnet_exists(dave_subnet_netuid), (
         "Subnet wasn't created successfully"
     )
 
-    subtensor.wait_for_block(subtensor.block + 20)
-    status, message = subtensor.start_call(dave_wallet, dave_subnet_netuid, True, True)
-    assert status, message
+    assert wait_to_start_call(subtensor, dave_wallet, dave_subnet_netuid, 10)
 
     with pytest.raises(SubstrateRequestException, match="AccountNotAllowedCommit"):
         subtensor.set_commitment(

tests/e2e_tests/test_delegate.py

@@ -12,6 +12,7 @@
     sudo_set_admin_utils,
     vote,
 )
+from tests.e2e_tests.utils.e2e_test_utils import wait_to_start_call
 from tests.helpers.helpers import CLOSE_IN_VALUE
 
 DEFAULT_DELEGATE_TAKE = 0.179995422293431
@@ -247,12 +248,7 @@ async def test_delegates(subtensor, alice_wallet, bob_wallet):
         "Subnet wasn't created successfully"
     )
 
-    # make sure we passed start_call limit
-    subtensor.wait_for_block(subtensor.block + 20)
-    status, message = subtensor.start_call(
-        alice_wallet, alice_subnet_netuid, True, True
-    )
-    assert status, message
+    assert wait_to_start_call(subtensor, alice_wallet, alice_subnet_netuid)
 
     subtensor.add_stake(
         bob_wallet,
@@ -304,12 +300,7 @@ def test_nominator_min_required_stake(local_chain, subtensor, alice_wallet, bob_
         "Subnet wasn't created successfully"
     )
 
-    # make sure we passed start_call limit
-    subtensor.wait_for_block(subtensor.block + 20)
-    status, message = subtensor.start_call(
-        alice_wallet, alice_subnet_netuid, True, True
-    )
-    assert status, message
+    assert wait_to_start_call(subtensor, alice_wallet, alice_subnet_netuid)
 
     minimum_required_stake = subtensor.get_minimum_required_stake()
 

tests/e2e_tests/test_dendrite.py

@@ -8,6 +8,7 @@
     sudo_set_admin_utils,
     wait_epoch,
 )
+from tests.e2e_tests.utils.e2e_test_utils import wait_to_start_call
 
 
 @pytest.mark.asyncio
@@ -29,19 +30,14 @@ async def test_dendrite(local_chain, subtensor, templates, alice_wallet, bob_wal
     logging.console.info("Testing test_dendrite")
 
     # Register a subnet, netuid 2
-    assert subtensor.register_subnet(alice_wallet), "Subnet wasn't created"
+    assert subtensor.register_subnet(alice_wallet, True, True), "Subnet wasn't created"
 
     # Verify subnet <netuid> created successfully
     assert subtensor.subnet_exists(alice_subnet_netuid), (
         "Subnet wasn't created successfully"
     )
 
-    # make sure we passed start_call limit
-    subtensor.wait_for_block(subtensor.block + 20)
-    status, message = subtensor.start_call(
-        alice_wallet, alice_subnet_netuid, True, True
-    )
-    assert status, message
+    assert wait_to_start_call(subtensor, alice_wallet, alice_subnet_netuid)
 
     # Make sure Alice is Top Validator
     assert subtensor.add_stake(

tests/e2e_tests/test_hotkeys.py

@@ -5,7 +5,7 @@
     sudo_set_admin_utils,
     wait_epoch,
 )
-
+from tests.e2e_tests.utils.e2e_test_utils import wait_to_start_call
 
 SET_CHILDREN_COOLDOWN_PERIOD = 15
 SET_CHILDREN_RATE_LIMIT = 150
@@ -19,15 +19,12 @@ def test_hotkeys(subtensor, alice_wallet, dave_wallet):
     """
 
     dave_subnet_netuid = 2
-    assert subtensor.register_subnet(dave_wallet)
+    assert subtensor.register_subnet(dave_wallet, True, True)
     assert subtensor.subnet_exists(dave_subnet_netuid), (
         f"Subnet #{dave_subnet_netuid} does not exist."
     )
 
-    # make sure we passed start_call limit
-    subtensor.wait_for_block(subtensor.block + 20)
-    status, message = subtensor.start_call(dave_wallet, dave_subnet_netuid, True, True)
-    assert status, message
+    assert wait_to_start_call(subtensor, dave_wallet, dave_subnet_netuid)
 
     coldkey = alice_wallet.coldkeypub.ss58_address
     hotkey = alice_wallet.hotkey.ss58_address
@@ -80,15 +77,12 @@ async def test_children(local_chain, subtensor, alice_wallet, bob_wallet, dave_w
     """
 
     dave_subnet_netuid = 2
-    assert subtensor.register_subnet(dave_wallet)
+    assert subtensor.register_subnet(dave_wallet, True, True)
     assert subtensor.subnet_exists(dave_subnet_netuid), (
         f"Subnet #{dave_subnet_netuid} does not exist."
     )
 
-    # make sure we passed start_call limit
-    subtensor.wait_for_block(subtensor.block + 20)
-    status, message = subtensor.start_call(dave_wallet, dave_subnet_netuid, True, True)
-    assert status, message
+    assert wait_to_start_call(subtensor, dave_wallet, dave_subnet_netuid)
 
     with pytest.raises(bittensor.RegistrationNotPermittedOnRootSubnet):
         subtensor.set_children(

tests/e2e_tests/test_incentive.py

@@ -7,6 +7,7 @@
     sudo_set_admin_utils,
     wait_epoch,
 )
+from tests.e2e_tests.utils.e2e_test_utils import wait_to_start_call
 
 DURATION_OF_START_CALL = 10
 
@@ -29,19 +30,14 @@ async def test_incentive(local_chain, subtensor, templates, alice_wallet, bob_wa
     alice_subnet_netuid = subtensor.get_total_subnets()  # 2
 
     # Register root as Alice - the subnet owner and validator
-    assert subtensor.register_subnet(alice_wallet)
+    assert subtensor.register_subnet(alice_wallet, True, True), "Subnet wasn't created"
 
     # Verify subnet <netuid> created successfully
     assert subtensor.subnet_exists(alice_subnet_netuid), (
         "Subnet wasn't created successfully"
     )
 
-    # make sure we passed start_call limit
-    subtensor.wait_for_block(subtensor.block + 20)
-    status, message = subtensor.start_call(
-        alice_wallet, alice_subnet_netuid, True, True
-    )
-    assert status, message
+    assert wait_to_start_call(subtensor, alice_wallet, alice_subnet_netuid)
 
     # Register Bob as a neuron on the subnet
     assert subtensor.burned_register(bob_wallet, alice_subnet_netuid), (

tests/e2e_tests/test_metagraph.py

@@ -6,6 +6,7 @@
 from bittensor.core.chain_data.metagraph_info import MetagraphInfo
 from bittensor.utils.balance import Balance
 from bittensor.utils.btlogging import logging
+from tests.e2e_tests.utils.e2e_test_utils import wait_to_start_call
 
 NULL_KEY = tuple(bytearray(32))
 
@@ -46,7 +47,7 @@ def test_metagraph(subtensor, alice_wallet, bob_wallet, dave_wallet):
         AssertionError: If any of the checks or verifications fail
     """
     logging.console.info("Testing test_metagraph_command")
-    alice_subnet_netuid = 2
+    alice_subnet_netuid = subtensor.get_total_subnets()  # 2
 
     logging.console.info("Register the subnet through Alice")
     assert subtensor.register_subnet(alice_wallet, True, True), (
@@ -59,8 +60,7 @@ def test_metagraph(subtensor, alice_wallet, bob_wallet, dave_wallet):
     )
 
     logging.console.info("Make sure we passed start_call limit (10 blocks)")
-    subtensor.wait_for_block(subtensor.block + 10)
-    assert subtensor.start_call(alice_wallet, alice_subnet_netuid, True, True)[0]
+    assert wait_to_start_call(subtensor, alice_wallet, alice_subnet_netuid)
 
     logging.console.info("Initialize metagraph")
     metagraph = subtensor.metagraph(netuid=alice_subnet_netuid)
@@ -196,7 +196,7 @@ def test_metagraph_info(subtensor, alice_wallet, bob_wallet):
     """
 
     alice_subnet_netuid = subtensor.get_total_subnets()  # 2
-    subtensor.register_subnet(alice_wallet)
+    subtensor.register_subnet(alice_wallet, True, True)
 
     metagraph_info = subtensor.get_metagraph_info(netuid=1, block=1)
 
@@ -370,11 +370,7 @@ def test_metagraph_info(subtensor, alice_wallet, bob_wallet):
         metagraph_info,
     ]
 
-    subtensor.wait_for_block(subtensor.block + 20)
-    status, message = subtensor.start_call(
-        alice_wallet, alice_subnet_netuid, True, True
-    )
-    assert status, message
+    assert wait_to_start_call(subtensor, alice_wallet, alice_subnet_netuid)
 
     assert subtensor.burned_register(
         bob_wallet,

tests/e2e_tests/test_reveal_commitments.py

@@ -3,6 +3,7 @@
 import pytest
 
 from bittensor.utils.btlogging import logging
+from tests.e2e_tests.utils.e2e_test_utils import wait_to_start_call
 
 
 @pytest.mark.parametrize("local_chain", [True], indirect=True)
@@ -37,12 +38,7 @@ async def test_set_reveal_commitment(local_chain, subtensor, alice_wallet, bob_w
         "Unable to register the subnet"
     )
 
-    # make sure we passed start_call limit
-    subtensor.wait_for_block(subtensor.block + 20)
-    status, message = subtensor.start_call(
-        alice_wallet, alice_subnet_netuid, True, True
-    )
-    assert status, message
+    assert wait_to_start_call(subtensor, alice_wallet, alice_subnet_netuid)
 
     # Register Bob's neuron
     assert subtensor.burned_register(bob_wallet, alice_subnet_netuid, True, True), (