Merge pull request #2724 from opentensor/tests/zyzniewski/refactor_duplicated_code

Refactor duplicated unittests code

Author: zyzniewski-reef

tests/helpers/helpers.py

@@ -2,7 +2,7 @@
 import json
 import time
 from collections import deque
-from typing import Union
+from typing import Optional, Union
 
 from bittensor_wallet.mock.wallet_mock import MockWallet as _MockWallet
 from bittensor_wallet.mock.wallet_mock import get_mock_coldkey
@@ -44,6 +44,45 @@ def __eq__(self, __o: Union[float, int, Balance]) -> bool:
         ) or ((__o - self.tolerance) <= self.value <= (__o + self.tolerance))
 
 
+def assert_submit_signed_extrinsic(
+    substrate,
+    keypair,
+    call_module,
+    call_function,
+    call_params: Optional[dict] = None,
+    era: Optional[dict] = None,
+    nonce: Optional[int] = None,
+    wait_for_inclusion: bool = False,
+    wait_for_finalization: bool = True,
+):
+    substrate.compose_call.assert_called_with(
+        call_module,
+        call_function,
+        call_params,
+    )
+
+    extrinsic = {
+        "call": substrate.compose_call.return_value,
+        "keypair": keypair,
+    }
+
+    if era:
+        extrinsic["era"] = era
+
+    if nonce:
+        extrinsic["nonce"] = nonce
+
+    substrate.create_signed_extrinsic.assert_called_with(
+        **extrinsic,
+    )
+
+    substrate.submit_extrinsic.assert_called_with(
+        substrate.create_signed_extrinsic.return_value,
+        wait_for_inclusion=wait_for_inclusion,
+        wait_for_finalization=wait_for_finalization,
+    )
+
+
 def get_mock_neuron(**kwargs) -> NeuronInfo:
     """
     Returns a mock neuron with the given kwargs overriding the default values.

tests/unit_tests/conftest.py

@@ -1,6 +1,5 @@
 import pytest
 from aioresponses import aioresponses
-from async_substrate_interface.sync_substrate import SubstrateInterface
 
 import bittensor.core.subtensor
 
@@ -17,18 +16,17 @@ def mock_aio_response():
 
 
 @pytest.fixture
-def mock_substrate_interface(mocker):
-    mocked = mocker.MagicMock(
-        autospec=SubstrateInterface,
+def mock_substrate(mocker):
+    mocked = mocker.patch(
+        "bittensor.core.subtensor.SubstrateInterface",
+        autospec=True,
     )
 
-    mocker.patch("bittensor.core.subtensor.SubstrateInterface", return_value=mocked)
-
-    return mocked
+    return mocked.return_value
 
 
 @pytest.fixture
-def subtensor(mock_substrate_interface):
+def subtensor(mock_substrate):
     return bittensor.core.subtensor.Subtensor()
 
 

tests/unit_tests/extrinsics/asyncex/conftest.py

@@ -0,0 +1,18 @@
+import pytest
+
+import bittensor.core.async_subtensor
+
+
+@pytest.fixture
+def mock_substrate(mocker):
+    mocked = mocker.patch(
+        "bittensor.core.async_subtensor.AsyncSubstrateInterface",
+        autospec=True,
+    )
+
+    return mocked.return_value
+
+
+@pytest.fixture
+def subtensor(mock_substrate):
+    return bittensor.core.async_subtensor.AsyncSubtensor()

tests/unit_tests/extrinsics/asyncex/test_commit_reveal.py

@@ -1,23 +1,12 @@
 from bittensor.core import async_subtensor as subtensor_module
 from bittensor.core.chain_data import SubnetHyperparameters
-from bittensor.core.async_subtensor import AsyncSubtensor
 from bittensor.core.extrinsics.asyncex import commit_reveal as async_commit_reveal
 import pytest
 import torch
 import numpy as np
 from bittensor_wallet import Wallet
 
 
-@pytest.fixture
-def subtensor(mocker):
-    fake_substrate = mocker.AsyncMock()
-    fake_substrate.websocket.socket.getsockopt.return_value = 0
-    mocker.patch.object(
-        subtensor_module, "AsyncSubstrateInterface", return_value=fake_substrate
-    )
-    yield AsyncSubtensor()
-
-
 @pytest.fixture
 def hyperparams():
     yield SubnetHyperparameters(

tests/unit_tests/extrinsics/asyncex/test_registration.py

@@ -5,17 +5,6 @@
 from bittensor.core.extrinsics.asyncex import registration as async_registration
 
 
-@pytest.fixture(autouse=True)
-def subtensor(mocker):
-    fake_async_substrate = mocker.AsyncMock(
-        autospec=async_subtensor.AsyncSubstrateInterface
-    )
-    mocker.patch.object(
-        async_subtensor, "AsyncSubstrateInterface", return_value=fake_async_substrate
-    )
-    return async_subtensor.AsyncSubtensor()
-
-
 @pytest.mark.asyncio
 async def test_do_pow_register_success(subtensor, mocker):
     """Tests successful PoW registration."""

tests/unit_tests/extrinsics/asyncex/test_root.py

@@ -1,22 +1,10 @@
 import pytest
 
-from bittensor.core import async_subtensor
 from bittensor.core.errors import SubstrateRequestException
 from bittensor.core.extrinsics.asyncex import root as async_root
 from bittensor_wallet import Wallet
 
 
-@pytest.fixture(autouse=True)
-def subtensor(mocker):
-    fake_async_substrate = mocker.AsyncMock(
-        autospec=async_subtensor.AsyncSubstrateInterface
-    )
-    mocker.patch.object(
-        async_subtensor, "AsyncSubstrateInterface", return_value=fake_async_substrate
-    )
-    return async_subtensor.AsyncSubtensor()
-
-
 @pytest.mark.asyncio
 async def test_get_limits_success(subtensor, mocker):
     """Tests successful retrieval of weight limits."""

tests/unit_tests/extrinsics/asyncex/test_transfer.py

@@ -1,21 +1,9 @@
 import pytest
-from bittensor.core import async_subtensor
 from bittensor_wallet import Wallet
 from bittensor.core.extrinsics.asyncex import transfer as async_transfer
 from bittensor.utils.balance import Balance
 
 
-@pytest.fixture(autouse=True)
-def subtensor(mocker):
-    fake_async_substrate = mocker.AsyncMock(
-        autospec=async_subtensor.AsyncSubstrateInterface
-    )
-    mocker.patch.object(
-        async_subtensor, "AsyncSubstrateInterface", return_value=fake_async_substrate
-    )
-    return async_subtensor.AsyncSubtensor()
-
-
 @pytest.mark.asyncio
 async def test_do_transfer_success(subtensor, mocker):
     """Tests _do_transfer when the transfer is successful."""
@@ -460,7 +448,7 @@ async def test_transfer_extrinsic_keep_alive_false_and_transfer_all_true(
     mocked_get_chain_head = mocker.patch.object(
         subtensor.substrate, "get_chain_head", return_value="some_block_hash"
     )
-    mocked_get_balance = mocker.patch.object(
+    mocker.patch.object(
         subtensor,
         "get_balance",
         return_value=1,

tests/unit_tests/extrinsics/asyncex/test_weights.py

@@ -4,17 +4,6 @@
 from bittensor.core.extrinsics.asyncex import weights as async_weights
 
 
-@pytest.fixture(autouse=True)
-def subtensor(mocker):
-    fake_async_substrate = mocker.AsyncMock(
-        autospec=async_subtensor.AsyncSubstrateInterface
-    )
-    mocker.patch.object(
-        async_subtensor, "AsyncSubstrateInterface", return_value=fake_async_substrate
-    )
-    return async_subtensor.AsyncSubtensor()
-
-
 @pytest.mark.asyncio
 async def test_do_set_weights_success(subtensor, mocker):
     """Tests _do_set_weights when weights are set successfully."""
@@ -56,7 +45,7 @@ async def fake_is_success():
 
     # Asserts
     assert result is True
-    assert message is ""
+    assert message == ""
 
 
 @pytest.mark.asyncio
@@ -146,7 +135,7 @@ async def test_do_set_weights_no_waiting(subtensor, mocker):
 
     # Asserts
     assert result is True
-    assert message is ""
+    assert message == ""
 
 
 @pytest.mark.asyncio
@@ -316,7 +305,7 @@ async def fake_is_success():
 
     # Asserts
     assert result is True
-    assert message is ""
+    assert message == ""
 
 
 @pytest.mark.asyncio
@@ -399,7 +388,7 @@ async def test_do_commit_weights_no_waiting(subtensor, mocker):
 
     # Asserts
     assert result is True
-    assert message is ""
+    assert message == ""
 
 
 @pytest.mark.asyncio

tests/unit_tests/extrinsics/test_commit_reveal.py

@@ -160,9 +160,7 @@ def test_commit_reveal_v3_extrinsic_success_with_torch(mocker, subtensor, hyperp
         "convert_weights_and_uids_for_emit",
         return_value=(mocked_uids, mocked_weights),
     )
-    mocked_get_subnet_reveal_period_epochs = mocker.patch.object(
-        subtensor, "get_subnet_reveal_period_epochs"
-    )
+    mocker.patch.object(subtensor, "get_subnet_reveal_period_epochs")
     mocked_get_encrypted_commit = mocker.patch.object(
         commit_reveal,
         "get_encrypted_commit",

tests/unit_tests/extrinsics/test_staking.py

@@ -1,5 +1,4 @@
 from bittensor.core.extrinsics import staking
-from bittensor.core.extrinsics import utils
 from bittensor.utils.balance import Balance