Skip to content

Commit 8b5b639

Browse files
rbarker-devrbarker-dev
committed
updated tests to use full paths, commented out items in __init__.py to
remove circular dependencies in many places Signed-off-by: Roger Barker <[email protected]>
1 parent cab19b1 commit 8b5b639

15 files changed

+167
-161
lines changed

‎examples/query_topic_message.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
from datetime import datetime, timezone
44
from dotenv import load_dotenv
55

6-
from hiero_sdk_python import Network, Client, TopicMessageQuery
6+
from hiero_sdk_python.client.network import Network
7+
from hiero_sdk_python.client.client import Client
8+
from hiero_sdk_python.query.topic_message_query import TopicMessageQuery
79

810
load_dotenv()
911

‎src/hiero_sdk_python/__init__.py‎

Lines changed: 133 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -1,160 +1,160 @@
11
# Client and Network
2-
from .client.client import Client
3-
from .client.network import Network
2+
# from .client.client import Client
3+
# from .client.network import Network
44

55
# Account
6-
from .account.account_id import AccountId
7-
from .account.account_create_transaction import AccountCreateTransaction
8-
from .account.account_info import AccountInfo
6+
# from .account.account_id import AccountId
7+
# from .account.account_create_transaction import AccountCreateTransaction
8+
# from .account.account_info import AccountInfo
99

1010
# Crypto
11-
from .crypto.private_key import PrivateKey
12-
from .crypto.public_key import PublicKey
11+
# from .crypto.private_key import PrivateKey
12+
# from .crypto.public_key import PublicKey
1313

1414
# Tokens
15-
from .tokens.token_create_transaction import TokenCreateTransaction
16-
from .tokens.token_associate_transaction import TokenAssociateTransaction
17-
from .tokens.token_dissociate_transaction import TokenDissociateTransaction
18-
from .tokens.token_delete_transaction import TokenDeleteTransaction
19-
from .tokens.token_info import TokenInfo
20-
from .tokens.token_mint_transaction import TokenMintTransaction
21-
from .tokens.token_freeze_transaction import TokenFreezeTransaction
22-
from .tokens.token_unfreeze_transaction import TokenUnfreezeTransaction
23-
from .tokens.token_wipe_transaction import TokenWipeTransaction
24-
from .tokens.token_reject_transaction import TokenRejectTransaction
25-
from .tokens.token_update_nfts_transaction import TokenUpdateNftsTransaction
26-
from .tokens.token_burn_transaction import TokenBurnTransaction
27-
from .tokens.token_grant_kyc_transaction import TokenGrantKycTransaction
28-
from .tokens.token_revoke_kyc_transaction import TokenRevokeKycTransaction
29-
from .tokens.token_update_transaction import TokenUpdateTransaction
30-
from .tokens.token_id import TokenId
31-
from .tokens.token_type import TokenType
32-
from .tokens.supply_type import SupplyType
33-
from .tokens.nft_id import NftId
34-
from .tokens.token_nft_transfer import TokenNftTransfer
35-
from .tokens.token_nft_info import TokenNftInfo
36-
from .tokens.token_relationship import TokenRelationship
15+
# from .tokens.token_create_transaction import TokenCreateTransaction
16+
# from .tokens.token_associate_transaction import TokenAssociateTransaction
17+
# from .tokens.token_dissociate_transaction import TokenDissociateTransaction
18+
# from .tokens.token_delete_transaction import TokenDeleteTransaction
19+
# from .tokens.token_info import TokenInfo
20+
# from .tokens.token_mint_transaction import TokenMintTransaction
21+
# from .tokens.token_freeze_transaction import TokenFreezeTransaction
22+
# from .tokens.token_unfreeze_transaction import TokenUnfreezeTransaction
23+
# from .tokens.token_wipe_transaction import TokenWipeTransaction
24+
# from .tokens.token_reject_transaction import TokenRejectTransaction
25+
# from .tokens.token_update_nfts_transaction import TokenUpdateNftsTransaction
26+
# from .tokens.token_burn_transaction import TokenBurnTransaction
27+
# from .tokens.token_grant_kyc_transaction import TokenGrantKycTransaction
28+
# from .tokens.token_revoke_kyc_transaction import TokenRevokeKycTransaction
29+
# from .tokens.token_update_transaction import TokenUpdateTransaction
30+
# from .tokens.token_id import TokenId
31+
# from .tokens.token_type import TokenType
32+
# from .tokens.supply_type import SupplyType
33+
# from .tokens.nft_id import NftId
34+
# from .tokens.token_nft_transfer import TokenNftTransfer
35+
# from .tokens.token_nft_info import TokenNftInfo
36+
# from .tokens.token_relationship import TokenRelationship
3737

3838
# Transaction
39-
from .transaction.transfer_transaction import TransferTransaction
40-
from .transaction.transaction_id import TransactionId
41-
from .transaction.transaction_receipt import TransactionReceipt
42-
from .transaction.transaction_response import TransactionResponse
43-
from .transaction.transaction_record import TransactionRecord
39+
# from .transaction.transfer_transaction import TransferTransaction
40+
# from .transaction.transaction_id import TransactionId
41+
# from .transaction.transaction_receipt import TransactionReceipt
42+
# from .transaction.transaction_response import TransactionResponse
43+
# from .transaction.transaction_record import TransactionRecord
4444

4545
# Response / Codes
46-
from .response_code import ResponseCode
46+
# from .response_code import ResponseCode
4747

4848
# HBAR
49-
from .hbar import Hbar
49+
# from .hbar import Hbar
5050

5151
# Timestamp
52-
from .timestamp import Timestamp
52+
# from .timestamp import Timestamp
5353

5454
# Duration
55-
from .Duration import Duration
55+
# from .Duration import Duration
5656

5757
# Consensus
58-
from .consensus.topic_create_transaction import TopicCreateTransaction
59-
from .consensus.topic_message_submit_transaction import TopicMessageSubmitTransaction
60-
from .consensus.topic_update_transaction import TopicUpdateTransaction
61-
from .consensus.topic_delete_transaction import TopicDeleteTransaction
62-
from .consensus.topic_id import TopicId
58+
# from .consensus.topic_create_transaction import TopicCreateTransaction
59+
# from .consensus.topic_message_submit_transaction import TopicMessageSubmitTransaction
60+
# from .consensus.topic_update_transaction import TopicUpdateTransaction
61+
# from .consensus.topic_delete_transaction import TopicDeleteTransaction
62+
# from .consensus.topic_id import TopicId
6363

6464
# Queries
65-
from .query.topic_info_query import TopicInfoQuery
66-
from .query.topic_message_query import TopicMessageQuery
67-
from .query.transaction_get_receipt_query import TransactionGetReceiptQuery
68-
from .query.transaction_record_query import TransactionRecordQuery
69-
from .query.account_balance_query import CryptoGetAccountBalanceQuery
70-
from .query.token_nft_info_query import TokenNftInfoQuery
71-
from .query.token_info_query import TokenInfoQuery
72-
from .query.account_info_query import AccountInfoQuery
65+
# from .query.topic_info_query import TopicInfoQuery
66+
# from .query.topic_message_query import TopicMessageQuery
67+
# from .query.transaction_get_receipt_query import TransactionGetReceiptQuery
68+
# from .query.transaction_record_query import TransactionRecordQuery
69+
# from .query.account_balance_query import CryptoGetAccountBalanceQuery
70+
# from .query.token_nft_info_query import TokenNftInfoQuery
71+
# from .query.token_info_query import TokenInfoQuery
72+
# from .query.account_info_query import AccountInfoQuery
7373

7474
# Address book
75-
from .address_book.endpoint import Endpoint
76-
from .address_book.node_address import NodeAddress
75+
# from .address_book.endpoint import Endpoint
76+
# from .address_book.node_address import NodeAddress
7777

7878
# Logger
79-
from .logger.logger import Logger
80-
from .logger.log_level import LogLevel
81-
82-
83-
__all__ = [
84-
# Client
85-
"Client",
86-
"Network",
87-
88-
# Account
89-
"AccountId",
90-
"AccountCreateTransaction",
91-
"AccountInfo",
92-
93-
# Crypto
94-
"PrivateKey",
95-
"PublicKey",
96-
97-
# Tokens
98-
"TokenCreateTransaction",
99-
"TokenAssociateTransaction",
100-
"TokenDissociateTransaction",
101-
"TokenDeleteTransaction",
102-
"TokenMintTransaction",
103-
"TokenFreezeTransaction",
104-
"TokenUnfreezeTransaction",
105-
"TokenWipeTransaction",
106-
"TokenId",
107-
"NftId",
108-
"TokenInfo",
109-
"TokenNftTransfer",
110-
"TokenNftInfo",
111-
"TokenRejectTransaction",
112-
"TokenUpdateNftsTransaction",
113-
"TokenBurnTransaction",
114-
"TokenGrantKycTransaction",
115-
"TokenRelationship",
116-
"TokenUpdateTransaction",
117-
"TokenType",
118-
"SupplyType",
119-
120-
# Transaction
121-
"TransferTransaction",
122-
"TransactionId",
123-
"TransactionReceipt",
124-
"TransactionResponse",
125-
"TransactionRecord",
126-
127-
# Response
128-
"ResponseCode",
129-
130-
# Consensus
131-
"TopicCreateTransaction",
132-
"TopicMessageSubmitTransaction",
133-
"TopicUpdateTransaction",
134-
"TopicDeleteTransaction",
135-
"TopicId",
136-
137-
# Queries
138-
"TopicInfoQuery",
139-
"TopicMessageQuery",
140-
"TransactionGetReceiptQuery",
141-
"TransactionRecordQuery",
142-
"CryptoGetAccountBalanceQuery",
143-
"TokenNftInfoQuery",
144-
"TokenInfoQuery",
145-
"AccountInfoQuery",
79+
# from .logger.logger import Logger
80+
# from .logger.log_level import LogLevel
81+
82+
83+
# __all__ = [
84+
# # Client
85+
# "Client",
86+
# "Network",
87+
88+
# # Account
89+
# "AccountId",
90+
# "AccountCreateTransaction",
91+
# "AccountInfo",
92+
93+
# # Crypto
94+
# "PrivateKey",
95+
# "PublicKey",
96+
97+
# # Tokens
98+
# "TokenCreateTransaction",
99+
# "TokenAssociateTransaction",
100+
# "TokenDissociateTransaction",
101+
# "TokenDeleteTransaction",
102+
# "TokenMintTransaction",
103+
# "TokenFreezeTransaction",
104+
# "TokenUnfreezeTransaction",
105+
# "TokenWipeTransaction",
106+
# "TokenId",
107+
# "NftId",
108+
# "TokenInfo",
109+
# "TokenNftTransfer",
110+
# "TokenNftInfo",
111+
# "TokenRejectTransaction",
112+
# "TokenUpdateNftsTransaction",
113+
# "TokenBurnTransaction",
114+
# "TokenGrantKycTransaction",
115+
# "TokenRelationship",
116+
# "TokenUpdateTransaction",
117+
# "TokenType",
118+
# "SupplyType",
119+
120+
# # Transaction
121+
# "TransferTransaction",
122+
# "TransactionId",
123+
# "TransactionReceipt",
124+
# "TransactionResponse",
125+
# "TransactionRecord",
126+
127+
# # Response
128+
# "ResponseCode",
129+
130+
# # Consensus
131+
# "TopicCreateTransaction",
132+
# "TopicMessageSubmitTransaction",
133+
# "TopicUpdateTransaction",
134+
# "TopicDeleteTransaction",
135+
# "TopicId",
136+
137+
# # Queries
138+
# "TopicInfoQuery",
139+
# "TopicMessageQuery",
140+
# "TransactionGetReceiptQuery",
141+
# "TransactionRecordQuery",
142+
# "CryptoGetAccountBalanceQuery",
143+
# "TokenNftInfoQuery",
144+
# "TokenInfoQuery",
145+
# "AccountInfoQuery",
146146

147-
# Address book
148-
"Endpoint",
149-
"NodeAddress",
147+
# # Address book
148+
# "Endpoint",
149+
# "NodeAddress",
150150

151-
# Logger
152-
"Logger",
153-
"LogLevel",
154-
155-
# HBAR
156-
"Hbar",
157-
"ResponseCode",
158-
"Timestamp",
159-
"Duration"
160-
]
151+
# # Logger
152+
# "Logger",
153+
# "LogLevel",
154+
155+
# # HBAR
156+
# "Hbar",
157+
# "ResponseCode",
158+
# "Timestamp",
159+
# "Duration"
160+
# ]

‎src/hiero_sdk_python/consensus/topic_message.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from datetime import datetime
22
from typing import Optional, List, Union, Dict
33

4-
from hiero_sdk_python import Timestamp
4+
from hiero_sdk_python.timestamp import Timestamp
55
from hiero_sdk_python.hapi.mirror import consensus_service_pb2 as mirror_proto
66

77
class TopicMessageChunk:

‎src/hiero_sdk_python/query/topic_message_query.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from hiero_sdk_python.consensus.topic_id import TopicId
99
from hiero_sdk_python.consensus.topic_message import TopicMessage
1010
from hiero_sdk_python.utils.subscription_handle import SubscriptionHandle
11-
from hiero_sdk_python import Client
11+
from hiero_sdk_python.client.client import Client
1212

1313

1414
class TopicMessageQuery:

‎src/hiero_sdk_python/query/transaction_record_query.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def _map_status_error(self, response):
157157

158158
receipt = response.transactionGetRecord.transactionRecord.receipt
159159

160-
return ReceiptStatusError(status, self.transaction_id, TransactionReceipt._from_proto(receipt))
160+
return ReceiptStatusError(status, self.transaction_id, TransactionReceipt._from_proto(receipt, self.transaction_id))
161161

162162
def execute(self, client):
163163
"""

‎src/hiero_sdk_python/tokens/__init__.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from .token_create_transaction import TokenCreateTransaction
2-
from .token_pause_transaction import TokenPauseTransaction
3-
from .token_id import TokenId
4-
from .token_type import TokenType
5-
from .supply_type import SupplyType
1+
# from .token_create_transaction import TokenCreateTransaction
2+
# from .token_pause_transaction import TokenPauseTransaction
3+
# from .token_id import TokenId
4+
# from .token_type import TokenType
5+
# from .supply_type import SupplyType

‎src/hiero_sdk_python/tokens/token_create_transaction.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
from hiero_sdk_python.channels import _Channel
1515
from hiero_sdk_python.executable import _Method
16+
from hiero_sdk_python.transaction.transaction import Transaction
1617
from hiero_sdk_python.hapi.services import token_create_pb2, basic_types_pb2, transaction_body_pb2
1718
from hiero_sdk_python.tokens.token_type import TokenType
1819
from hiero_sdk_python.tokens.supply_type import SupplyType
@@ -185,7 +186,6 @@ def _validate_supply_max_and_type(token_params: TokenParams) -> None:
185186
"Initial supply cannot exceed the defined max supply for a finite token"
186187
)
187188

188-
from hiero_sdk_python.transaction.transaction import Transaction
189189
class TokenCreateTransaction(Transaction):
190190
"""
191191
Represents a token creation transaction on the Hedera network.

‎src/hiero_sdk_python/tokens/token_info.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# pylint: disable=C901
22
# pylint: disable=too-many-arguments
33

4-
from dataclasses import dataclass
5-
from typing import Optional, Union
4+
from dataclasses import dataclass, field
5+
from typing import Optional
66
from hiero_sdk_python.tokens.token_id import TokenId
77
from hiero_sdk_python.account.account_id import AccountId
88
from hiero_sdk_python.crypto.public_key import PublicKey
@@ -43,10 +43,10 @@ class TokenInfo:
4343
supplyKey: Optional[PublicKey] = None
4444
wipeKey: Optional[PublicKey] = None
4545

46-
defaultFreezeStatus: TokenFreezeStatus = TokenFreezeStatus.FREEZE_NOT_APPLICABLE
47-
defaultKycStatus: TokenKycStatus = TokenKycStatus.KYC_NOT_APPLICABLE
48-
pause_status: TokenPauseStatus = TokenPauseStatus.PAUSE_NOT_APPLICABLE
49-
supplyType: SupplyType = SupplyType.FINITE
46+
defaultFreezeStatus: TokenFreezeStatus = field(default_factory=lambda: TokenFreezeStatus.FREEZE_NOT_APPLICABLE)
47+
defaultKycStatus: TokenKycStatus = field(default_factory=lambda: TokenKycStatus.KYC_NOT_APPLICABLE)
48+
pause_status: TokenPauseStatus = field(default_factory=lambda: TokenPauseStatus.PAUSE_NOT_APPLICABLE)
49+
supplyType: SupplyType = field(default_factory=lambda: SupplyType.FINITE)
5050

5151
def set_admin_key(self, adminKey: PublicKey) -> None:
5252
"""Sets the admin key for the token."""
@@ -224,5 +224,6 @@ def __str__(self) -> str:
224224
return (f"TokenInfo(tokenId={self.tokenId}, name={self.name}, symbol={self.symbol}, "
225225
f"decimals={self.decimals}, totalSupply={self.totalSupply}, treasury={self.treasury}, "
226226
f"isDeleted={self.isDeleted}, memo={self.memo}, tokenType={self.tokenType}, "
227-
f"maxSupply={self.maxSupply}, ledger_id={self.ledger_id}, metadata={self.metadata!r}")
227+
f"maxSupply={self.maxSupply}, ledger_id={self.ledger_id}, "
228+
f"metadata={self.metadata!r})")
228229

0 commit comments

Comments
 (0)