chore: trim down tests

Signed-off-by: exploreriii <133720349+exploreriii@users.noreply.github.com>

Author: exploreriii

tests/tck/contract_handler_test.py

@@ -2,12 +2,8 @@
 
 from __future__ import annotations
 
-import importlib
-import sys
-
 import pytest
 
-from hiero_sdk_python.crypto.private_key import PrivateKey
 from tck.errors import JsonRpcError
 from tck.handlers import contract as contract_handlers
 from tck.param.contract import CreateContractParams
@@ -16,95 +12,7 @@
 pytestmark = pytest.mark.unit
 
 
-class TestCreateContractParams:
-    def test_parses_all_params(self):
-        params = CreateContractParams.parse_json_params(
-            {
-                "sessionId": "session-1",
-                "bytecodeFileId": "0.0.123",
-                "initcode": "0x60006000",
-                "adminKey": PrivateKey.generate_ed25519().public_key().to_string_der(),
-                "gas": "1000000",
-                "initialBalance": "1000",
-                "constructorParameters": "0xabcd",
-                "autoRenewPeriod": "7000000",
-                "autoRenewAccountId": "0.0.5",
-                "memo": "contract test",
-                "stakedAccountId": "0.0.6",
-                "stakedNodeId": "3",
-                "declineStakingReward": True,
-                "maxAutomaticTokenAssociations": 10,
-                "commonTransactionParams": {"memo": "tx memo"},
-            }
-        )
-
-        assert params.sessionId == "session-1"
-        assert params.bytecodeFileId == "0.0.123"
-        assert params.initcode == "0x60006000"
-        assert params.gas == "1000000"
-        assert params.initialBalance == "1000"
-        assert params.constructorParameters == "0xabcd"
-        assert params.autoRenewPeriod == "7000000"
-        assert params.autoRenewAccountId == "0.0.5"
-        assert params.memo == "contract test"
-        assert params.stakedAccountId == "0.0.6"
-        assert params.stakedNodeId == "3"
-        assert params.declineStakingReward is True
-        assert params.maxAutomaticTokenAssociations == 10
-        assert params.commonTransactionParams is not None
-        assert params.commonTransactionParams.memo == "tx memo"
-
-    def test_requires_session_id(self):
-        with pytest.raises(ValueError):
-            CreateContractParams.parse_json_params({"gas": "1000000"})
-
-    def test_absent_params_stay_none(self):
-        params = CreateContractParams.parse_json_params({"sessionId": "session-1"})
-
-        assert params.bytecodeFileId is None
-        assert params.initcode is None
-        assert params.adminKey is None
-        assert params.gas is None
-        assert params.declineStakingReward is None
-        assert params.maxAutomaticTokenAssociations is None
-        assert params.commonTransactionParams is None
-
-
 class TestBuildCreateContractTransaction:
-    def test_maps_all_params(self):
-        admin_key = PrivateKey.generate_ed25519().public_key()
-        params = CreateContractParams(
-            sessionId="session-1",
-            initcode="0x60006000",
-            adminKey=admin_key.to_string_der(),
-            gas="1000000",
-            initialBalance="1000",
-            constructorParameters="0xabcd",
-            autoRenewPeriod="7000000",
-            autoRenewAccountId="0.0.5",
-            memo="contract test",
-            stakedAccountId="0.0.6",
-            declineStakingReward=True,
-            maxAutomaticTokenAssociations=10,
-        )
-
-        transaction = contract_handlers._build_create_contract_transaction(params)
-
-        assert transaction.bytecode == b"\x60\x00\x60\x00"
-        assert transaction.bytecode_file_id is None
-        assert transaction.gas == 1000000
-        assert transaction.initial_balance == 1000
-        assert transaction.parameters == b"\xab\xcd"
-        assert transaction.auto_renew_period.seconds == 7000000
-        assert str(transaction.auto_renew_account_id) == "0.0.5"
-        assert transaction.contract_memo == "contract test"
-        assert str(transaction.staked_account_id) == "0.0.6"
-        assert transaction.staked_node_id is None
-        assert transaction.decline_reward is True
-        assert transaction.max_automatic_token_associations == 10
-        assert transaction.admin_key is not None
-        assert transaction.admin_key.to_bytes() == admin_key.to_bytes()
-
     def test_bytecode_file_id_wins_when_both_sources_supplied(self):
         params = CreateContractParams(
             sessionId="session-1",
@@ -118,98 +26,15 @@ def test_bytecode_file_id_wins_when_both_sources_supplied(self):
         assert str(transaction.bytecode_file_id) == "0.0.123"
         assert transaction.bytecode is None
 
-    def test_neither_bytecode_source_left_unset_for_network(self):
-        params = CreateContractParams(sessionId="session-1", gas="1000000")
-
-        transaction = contract_handlers._build_create_contract_transaction(params)
-
-        assert transaction.bytecode is None
-        assert transaction.bytecode_file_id is None
-
-    def test_default_auto_renew_period_preserved_when_absent(self):
-        params = CreateContractParams(sessionId="session-1", gas="1000000")
-
-        transaction = contract_handlers._build_create_contract_transaction(params)
-
-        assert transaction.auto_renew_period.seconds == 90 * 24 * 60 * 60
-
     def test_invalid_gas_raises_invalid_params(self):
         params = CreateContractParams(sessionId="session-1", gas="not-a-number")
 
         with pytest.raises(JsonRpcError):
             contract_handlers._build_create_contract_transaction(params)
 
-    def test_int64_boundaries_pass_through_to_the_network(self):
-        params = CreateContractParams(
-            sessionId="session-1",
-            gas="9223372036854775807",
-            initialBalance="-9223372036854775808",
-        )
-
-        transaction = contract_handlers._build_create_contract_transaction(params)
-
-        assert transaction.gas == 9223372036854775807
-        assert transaction.initial_balance == -9223372036854775808
-
-    @pytest.mark.parametrize("gas", ["-1", "-9223372036854775808"])
-    def test_negative_gas_raises_sdk_error(self, gas):
-        """The TCK driver expects an internal SDK error for negative gas, matching the JS SDK."""
-        params = CreateContractParams(sessionId="session-1", gas=gas)
-
-        with pytest.raises(ValueError, match="Gas cannot be negative"):
-            contract_handlers._build_create_contract_transaction(params)
-
     @pytest.mark.parametrize("gas", ["9223372036854775808", "-9223372036854775809"])
     def test_gas_out_of_int64_range_raises_invalid_params(self, gas):
         params = CreateContractParams(sessionId="session-1", gas=gas)
 
         with pytest.raises(JsonRpcError):
             contract_handlers._build_create_contract_transaction(params)
-
-    def test_maps_staked_node_id(self):
-        params = CreateContractParams(sessionId="session-1", stakedNodeId="3", gas="1000000")
-
-        transaction = contract_handlers._build_create_contract_transaction(params)
-
-        assert transaction.staked_node_id == 3
-        assert transaction.staked_account_id is None
-
-    def test_last_staking_target_wins_when_both_supplied(self):
-        """The SDK setters keep the staked_id oneof consistent; last applied (stakedNodeId) wins."""
-        params = CreateContractParams(
-            sessionId="session-1",
-            stakedAccountId="0.0.6",
-            stakedNodeId="3",
-            gas="1000000",
-        )
-
-        transaction = contract_handlers._build_create_contract_transaction(params)
-
-        assert transaction.staked_account_id is None
-        assert transaction.staked_node_id == 3
-
-    def test_invalid_initcode_hex_raises_value_error(self):
-        params = CreateContractParams(sessionId="session-1", initcode="0xZZ", gas="1000000")
-
-        with pytest.raises(ValueError):
-            contract_handlers._build_create_contract_transaction(params)
-
-
-def test_create_contract_registered_via_package_import():
-    """Importing the tck.handlers package alone must register createContract.
-
-    Re-importing the package from scratch (which recreates the registry) makes
-    this test fail if tck/handlers/__init__.py stops importing the contract
-    module; module-level imports in this file cannot mask that.
-    """
-    saved = {
-        name: mod for name, mod in sys.modules.items() if name == "tck.handlers" or name.startswith("tck.handlers.")
-    }
-    try:
-        for name in saved:
-            del sys.modules[name]
-        fresh_handlers = importlib.import_module("tck.handlers")
-        assert fresh_handlers.get_handler("createContract") is not None
-    finally:
-        sys.modules.update(saved)
-        sys.modules["tck"].handlers = saved["tck.handlers"]

tests/tck/param_utils_test.py

@@ -4,7 +4,7 @@
 
 import pytest
 
-from tck.util.param_utils import decode_hex
+from tck.util.param_utils import decode_hex, parse_session_id
 
 
 pytestmark = pytest.mark.unit
@@ -33,3 +33,13 @@ def test_rejects_embedded_whitespace(self):
     def test_rejects_surrounding_whitespace(self):
         with pytest.raises(ValueError):
             decode_hex(" 6000\n")
+
+
+class TestParseSessionId:
+    def test_returns_session_id(self):
+        assert parse_session_id({"sessionId": "session-1"}) == "session-1"
+
+    @pytest.mark.parametrize("params", [{}, {"sessionId": ""}, {"sessionId": 123}])
+    def test_rejects_missing_or_invalid_session_id(self, params):
+        with pytest.raises(ValueError):
+            parse_session_id(params)