refactor(tck): centralize transaction receipt validation in execute_validated helper (#2649)

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

Author: Abhijeet2409

tck/handlers/account.py

@@ -41,6 +41,7 @@
 from tck.util.client_utils import get_client
 from tck.util.constants import DEFAULT_GRPC_TIMEOUT
 from tck.util.key_utils import get_key_from_string, key_to_string
+from tck.util.transaction_utils import execute_validated
 
 
 def _build_create_account_transaction(params: CreateAccountParams) -> AccountCreateTransaction:
@@ -89,17 +90,15 @@ def create_account(params: CreateAccountParams) -> CreateAccountResponse:
     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)
 
     account_id = ""
-    if receipt.status == ResponseCode.SUCCESS:
-        account_id = str(receipt.account_id)
+    account_id = str(receipt.account_id)
 
     return CreateAccountResponse(
         account_id,
         ResponseCode(receipt.status).name,
-        str(response.transaction_id) if response.transaction_id is not None else None,
+        str(receipt.transaction_id) if receipt.transaction_id is not None else None,
     )
 
 
@@ -150,8 +149,7 @@ def update_account(params: UpdateAccountParams) -> UpdateAccountResponse:
     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)
 
     return UpdateAccountResponse(ResponseCode(receipt.status).name)
 
@@ -258,8 +256,7 @@ def delete_account(params: DeleteAccountParams) -> DeleteAccountResponse:
     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)
 
     return DeleteAccountResponse(status=ResponseCode(receipt.status).name)
 

tck/handlers/allowance.py

@@ -13,7 +13,6 @@
 from hiero_sdk_python.response_code import ResponseCode
 from hiero_sdk_python.tokens.nft_id import NftId
 from hiero_sdk_python.tokens.token_id import TokenId
-from hiero_sdk_python.transaction.transaction_receipt import TransactionReceipt
 from tck.handlers.registry import rpc_method
 from tck.param.allowance import (
     AllowanceEntry,
@@ -24,6 +23,7 @@
 from tck.response.allowance import ApproveAllowanceResponse, DeleteAllowanceResponse
 from tck.util.client_utils import get_client
 from tck.util.constants import DEFAULT_GRPC_TIMEOUT
+from tck.util.transaction_utils import execute_validated
 
 
 def _build_approve_allowance_transaction(
@@ -130,8 +130,7 @@ def approve_allowance(params: ApproveAllowanceParams) -> ApproveAllowanceRespons
     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)
 
     return ApproveAllowanceResponse(status=ResponseCode(receipt.status).name)
 
@@ -178,7 +177,6 @@ def delete_allowance(params: DeleteAllowanceParams) -> DeleteAllowanceResponse:
     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)
 
     return DeleteAllowanceResponse(status=ResponseCode(receipt.status).name)

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)

tck/handlers/file.py

@@ -9,7 +9,6 @@
 from hiero_sdk_python.hbar import Hbar
 from hiero_sdk_python.response_code import ResponseCode
 from hiero_sdk_python.timestamp import Timestamp
-from hiero_sdk_python.transaction.transaction_receipt import TransactionReceipt
 from tck.errors import JsonRpcError
 from tck.handlers.registry import rpc_method
 from tck.param.file import CreateFileParams, DeleteFileParams, GetFileContentsParams, GetFileInfoParams
@@ -18,6 +17,7 @@
 from tck.util.constants import DEFAULT_GRPC_TIMEOUT
 from tck.util.key_utils import get_key_from_string, key_to_string
 from tck.util.param_utils import to_int
+from tck.util.transaction_utils import execute_validated
 
 
 def _build_create_file_transaction(params: CreateFileParams) -> FileCreateTransaction:
@@ -51,11 +51,10 @@ def create_file(params: CreateFileParams) -> CreateFileResponse:
     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)
 
     file_id = ""
-    if receipt.status == ResponseCode.SUCCESS and receipt.file_id is not None:
+    if receipt.file_id is not None:
         file_id = str(receipt.file_id)
 
     return CreateFileResponse(file_id, ResponseCode(receipt.status).name)
@@ -122,7 +121,6 @@ def delete_file(params: DeleteFileParams) -> DeleteFileResponse:
     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)
 
     return DeleteFileResponse(ResponseCode(receipt.status).name)

tck/handlers/schedule.py

@@ -11,7 +11,6 @@
 from hiero_sdk_python.schedule.schedule_sign_transaction import ScheduleSignTransaction
 from hiero_sdk_python.timestamp import Timestamp
 from hiero_sdk_python.transaction.transaction import Transaction
-from hiero_sdk_python.transaction.transaction_receipt import TransactionReceipt
 from tck.errors import JsonRpcError
 from tck.handlers.account import _build_create_account_transaction
 from tck.handlers.allowance import _build_approve_allowance_transaction
@@ -37,6 +36,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 to_int
+from tck.util.transaction_utils import execute_validated
 
 
 # Maps a scheduled transaction method name to its params class and builder.
@@ -154,16 +154,14 @@ def create_schedule(params: CreateScheduleParams) -> CreateScheduleResponse:
     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)
 
     schedule_id = ""
     scheduled_transaction_id = None
-    if receipt.status == ResponseCode.SUCCESS:
-        if receipt.schedule_id is not None:
-            schedule_id = str(receipt.schedule_id)
-        if receipt.scheduled_transaction_id is not None:
-            scheduled_transaction_id = str(receipt.scheduled_transaction_id)
+    if receipt.schedule_id is not None:
+        schedule_id = str(receipt.schedule_id)
+    if receipt.scheduled_transaction_id is not None:
+        scheduled_transaction_id = str(receipt.scheduled_transaction_id)
 
     return CreateScheduleResponse(schedule_id, scheduled_transaction_id, ResponseCode(receipt.status).name)
 
@@ -188,8 +186,7 @@ def sign_schedule(params: SignScheduleParams) -> SignScheduleResponse:
     if common_params is not None:
         common_params.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)
 
     return SignScheduleResponse(status=ResponseCode(receipt.status).name)
 
@@ -204,7 +201,6 @@ def delete_schedule(params: DeleteScheduleParams) -> DeleteScheduleResponse:
     if params.commonTransactionParams is not None:
         params.commonTransactionParams.apply_common_params(transaction, client)
 
-    response = transaction.execute(client, wait_for_receipt=False)
-    receipt = response.get_receipt(client, validate_status=True)
+    receipt = execute_validated(transaction, client)
 
     return DeleteScheduleResponse(status=ResponseCode(receipt.status).name)