refactor(tck): convert contract.py aligned with new execute_validated after hiero-ledger#2611 merge

Signed-off-by: Abhijeet Saharan <abhijeetsaharan2236@gmail.com>

Author: Abhijeet2409

tck/handlers/contract.py

@@ -5,7 +5,6 @@
 from hiero_sdk_python.Duration import Duration
 from hiero_sdk_python.file.file_id import FileId
 from hiero_sdk_python.response_code import ResponseCode
-from hiero_sdk_python.transaction.transaction_receipt import TransactionReceipt
 from tck.errors import JsonRpcError
 from tck.handlers.registry import rpc_method
 from tck.param.contract import CreateContractParams
@@ -14,6 +13,7 @@
 from tck.util.constants import DEFAULT_GRPC_TIMEOUT
 from tck.util.key_utils import get_key_from_string
 from tck.util.param_utils import decode_hex, to_int
+from tck.util.transaction_utils import execute_validated
 
 
 INT64_MIN = -(2**63)
@@ -99,11 +99,10 @@ def create_contract(params: CreateContractParams) -> CreateContractResponse:
     if params.commonTransactionParams is not None:
         params.commonTransactionParams.apply_common_params(transaction, client)
 
-    response = transaction.execute(client, wait_for_receipt=False)
-    receipt: TransactionReceipt = response.get_receipt(client, validate_status=True)
+    receipt = execute_validated(transaction, client)
 
     contract_id = ""
-    if receipt.status == ResponseCode.SUCCESS and receipt.contract_id is not None:
+    if receipt.contract_id is not None:
         contract_id = str(receipt.contract_id)
 
     return CreateContractResponse(contract_id, ResponseCode(receipt.status).name)

tests/tck/transaction_utils_test.py

@@ -14,8 +14,8 @@
 pytestmark = pytest.mark.unit
 
 
-class TestExecuteValidated:
-    """Test the execute_validated helper's success and failure paths."""
+class TestExecuteValidatedSuccess:
+    """Test the execute_validated helper's success path."""
 
     def test_returns_receipt_on_success(self):
         """Test that execute_validated returns the receipt when validation succeeds."""
@@ -34,6 +34,10 @@ def test_returns_receipt_on_success(self):
         mock_transaction.execute.assert_called_once_with(mock_client, wait_for_receipt=False)
         mock_response.get_receipt.assert_called_once_with(mock_client, validate_status=True)
 
+
+class TestExecuteValidatedErrors:
+    """Test the execute_validated helper's failure path."""
+
     def test_raises_receipt_status_error_on_failure(self):
         """Test that execute_validated propagates ReceiptStatusError without catching it."""
         mock_transaction_id = MagicMock()
@@ -50,5 +54,8 @@ def test_raises_receipt_status_error_on_failure(self):
         mock_transaction.execute.return_value = mock_response
         mock_client = MagicMock()
 
-        with pytest.raises(ReceiptStatusError):
+        with pytest.raises(ReceiptStatusError) as exc_info:
             execute_validated(mock_transaction, mock_client)
+
+        if exc_info.value.status != ResponseCode.ACCOUNT_DELETED:
+            raise AssertionError("Expected the raised error's status to be preserved")