Skip to content

Commit a5e83c0

Browse files
committed
refactor: replace AssertionError with ValueError
Replaces all instances of raising AssertionError with ValueError for invalid argument or state errors across the codebase. This improves clarity and aligns with Python's standard exception usage for value validation. FileNotFoundError is used where appropriate for missing files. No functional changes to logic or error messages.
1 parent b0c2eae commit a5e83c0

12 files changed

+41
-41
lines changed

cardano_clusterlib/address_group.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def gen_payment_addr(
5656
cli_args = ["--payment-verification-key", str(payment_vkey)]
5757
else:
5858
msg = "Either `payment_vkey_file`, `payment_script_file` or `payment_vkey` is needed."
59-
raise AssertionError(msg)
59+
raise ValueError(msg)
6060

6161
if stake_vkey:
6262
cli_args.extend(["--stake-verification-key", str(stake_vkey)])
@@ -137,7 +137,7 @@ def get_payment_vkey_hash(
137137
cli_args = ["--payment-verification-key-file", str(payment_vkey_file)]
138138
else:
139139
msg = "Either `payment_vkey` or `payment_vkey_file` is needed."
140-
raise AssertionError(msg)
140+
raise ValueError(msg)
141141

142142
return (
143143
self._clusterlib_obj.cli(["address", "key-hash", *cli_args])

cardano_clusterlib/clusterlib_helpers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ def get_epoch_for_slot(cluster_obj: "itp.ClusterLib", slot_no: int) -> EpochInfo
160160
genesis_byron = cluster_obj.state_dir / "byron" / "genesis.json"
161161
if not genesis_byron.exists():
162162
msg = f"File '{genesis_byron}' does not exist."
163-
raise AssertionError(msg)
163+
raise FileNotFoundError(msg)
164164

165165
with open(genesis_byron, encoding="utf-8") as in_json:
166166
byron_dict = json.load(in_json)

cardano_clusterlib/gov_action_group.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def _get_deposit_return_key_args(
4242
key_args = ["--deposit-return-stake-key-hash", str(deposit_return_stake_key_hash)]
4343
else:
4444
msg = "Either stake verification key or stake key hash must be set."
45-
raise AssertionError(msg)
45+
raise ValueError(msg)
4646

4747
return key_args
4848

@@ -86,7 +86,7 @@ def _get_cc_members_args(
8686
)
8787
else:
8888
msg = f"Either {arg_action} cold verification key or its hash must be set."
89-
raise AssertionError(msg)
89+
raise ValueError(msg)
9090

9191
if not remove:
9292
cc_members_args.extend(["--epoch", str(cc_member.epoch)])
@@ -103,7 +103,7 @@ def _get_optional_prev_action_args(
103103
if prev_action_txid:
104104
if prev_action_ix == -1:
105105
msg = "Previous action index must be set."
106-
raise AssertionError(msg)
106+
raise ValueError(msg)
107107
prev_action_args = [
108108
"--prev-governance-action-tx-id",
109109
str(prev_action_txid),
@@ -508,7 +508,7 @@ def create_treasury_withdrawal(
508508
]
509509
else:
510510
msg = "Either stake verification key or stake key hash must be set."
511-
raise AssertionError(msg)
511+
raise ValueError(msg)
512512

513513
deposit_key_args = self._get_deposit_return_key_args(
514514
deposit_return_stake_vkey=deposit_return_stake_vkey,

cardano_clusterlib/gov_committee_group.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def _get_cold_vkey_args(
3131
key_args = ["--cold-key-hash", str(cold_vkey_hash)]
3232
else:
3333
msg = "Either `cold_vkey`, `cold_vkey_file` or `cold_vkey_hash` is needed."
34-
raise AssertionError(msg)
34+
raise ValueError(msg)
3535

3636
return key_args
3737

@@ -99,7 +99,7 @@ def gen_hot_key_auth_cert(
9999
hot_key_args = ["--hot-verification-key-hash", str(hot_key_hash)]
100100
else:
101101
msg = "Either `hot_key`, `hot_key_file` or `hot_key_hash` is needed."
102-
raise AssertionError(msg)
102+
raise ValueError(msg)
103103

104104
self._clusterlib_obj.cli(
105105
[
@@ -176,7 +176,7 @@ def get_key_hash(
176176
key_args = ["--verification-key-file", str(vkey_file)]
177177
else:
178178
msg = "Either `vkey` or `vkey_file` is needed."
179-
raise AssertionError(msg)
179+
raise ValueError(msg)
180180

181181
key_hash = (
182182
self._clusterlib_obj.cli([*self._group_args, "key-hash", *key_args])

cardano_clusterlib/gov_drep_group.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def _get_cred_args(
5656
msg = (
5757
"Either `script_hash`, `drep_vkey`, `drep_vkey_file` or `drep_key_hash` is needed."
5858
)
59-
raise AssertionError(msg)
59+
raise ValueError(msg)
6060

6161
return cred_args
6262

@@ -111,12 +111,12 @@ def get_id(
111111
cli_args = ["--drep-verification-key-file", str(drep_vkey_file)]
112112
else:
113113
msg = "Either `drep_vkey` or `drep_vkey_file` is needed."
114-
raise AssertionError(msg)
114+
raise ValueError(msg)
115115

116116
if out_format:
117117
if out_format not in ("hex", "bech32"):
118118
msg = f"Invalid output format: {out_format} (expected 'hex' or 'bech32')."
119-
raise AssertionError(msg)
119+
raise ValueError(msg)
120120
if self._has_output_hex:
121121
cli_args.append(f"--output-{out_format}")
122122
else:

cardano_clusterlib/gov_group.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def get_anchor_data_hash(
7777
content_args = ["--file-text", str(file_text)]
7878
else:
7979
msg = "Either `text`, `file_binary` or `file_text` is needed."
80-
raise AssertionError(msg)
80+
raise ValueError(msg)
8181

8282
out_hash = (
8383
self._clusterlib_obj.cli(

cardano_clusterlib/gov_vote_group.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def _get_vote_args(
3131
vote_args = ["--abstain"]
3232
else:
3333
msg = "No vote was specified."
34-
raise AssertionError(msg)
34+
raise ValueError(msg)
3535

3636
return vote_args
3737

@@ -57,7 +57,7 @@ def _get_anchor_args(
5757
if anchor_url:
5858
if not anchor_data_hash:
5959
msg = "Anchor data hash is required when anchor URL is specified."
60-
raise AssertionError(msg)
60+
raise ValueError(msg)
6161
anchor_args = [
6262
"--anchor-url",
6363
str(anchor_url),
@@ -101,7 +101,7 @@ def create_committee(
101101
cred_args = ["--cc-hot-script-hash", cc_hot_script_hash]
102102
else:
103103
msg = "No CC key or script hash was specified."
104-
raise AssertionError(msg)
104+
raise ValueError(msg)
105105

106106
self._clusterlib_obj.cli(
107107
[
@@ -166,7 +166,7 @@ def create_drep(
166166
cred_args = ["--drep-script-hash", drep_script_hash]
167167
else:
168168
msg = "No DRep key or script hash was specified."
169-
raise AssertionError(msg)
169+
raise ValueError(msg)
170170

171171
self._clusterlib_obj.cli(
172172
[
@@ -228,7 +228,7 @@ def create_spo(
228228
key_args = ["--stake-pool-id", stake_pool_id]
229229
else:
230230
msg = "No key was specified."
231-
raise AssertionError(msg)
231+
raise ValueError(msg)
232232

233233
self._clusterlib_obj.cli(
234234
[

cardano_clusterlib/query_group.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def get_utxo(
112112
cli_args.extend(helpers._prepend_flag("--tx-in", utxo_formatted))
113113
else:
114114
msg = "Either `address`, `txin`, `utxo` or `tx_raw_output` need to be specified."
115-
raise AssertionError(msg)
115+
raise ValueError(msg)
116116

117117
utxo_dict = json.loads(self.query_cli(cli_args))
118118
utxos = txtools.get_utxo(utxo_dict=utxo_dict, address=address_single, coins=coins)
@@ -397,7 +397,7 @@ def get_leadership_schedule(
397397
)
398398
else:
399399
msg = "Either `stake_pool_vkey`, `cold_vkey_file` or `stake_pool_id` is needed."
400-
raise AssertionError(msg)
400+
raise ValueError(msg)
401401

402402
args.append("--next" if for_next else "--current")
403403

cardano_clusterlib/stake_address_group.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def _get_stake_vkey_args(
3434
stake_args = ["--stake-address", stake_address]
3535
else:
3636
msg = "Either `stake_vkey_file`, `stake_script_file` or `stake_address` is needed."
37-
raise AssertionError(msg)
37+
raise ValueError(msg)
3838

3939
return stake_args
4040

@@ -62,7 +62,7 @@ def _get_drep_args(
6262
drep_args = ["--drep-key-hash", str(drep_key_hash)]
6363
else:
6464
msg = "DRep identification, verification key or script hash is needed."
65-
raise AssertionError(msg)
65+
raise ValueError(msg)
6666

6767
return drep_args
6868

@@ -81,7 +81,7 @@ def _get_pool_key_args(
8181
pool_key_args = ["--stake-pool-id", stake_pool_id]
8282
else:
8383
msg = "No stake pool key was specified."
84-
raise AssertionError(msg)
84+
raise ValueError(msg)
8585

8686
return pool_key_args
8787

@@ -113,7 +113,7 @@ def gen_stake_addr(
113113
cli_args = ["--stake-script-file", str(stake_script_file)]
114114
else:
115115
msg = "Either `stake_vkey_file` or `stake_script_file` is needed."
116-
raise AssertionError(msg)
116+
raise ValueError(msg)
117117

118118
self._clusterlib_obj.cli(
119119
[
@@ -517,7 +517,7 @@ def get_stake_vkey_hash(
517517
cli_args = ["--stake-verification-key-file", str(stake_vkey_file)]
518518
else:
519519
msg = "Either `stake_vkey` or `stake_vkey_file` is needed."
520-
raise AssertionError(msg)
520+
raise ValueError(msg)
521521

522522
return (
523523
self._clusterlib_obj.cli(["stake-address", "key-hash", *cli_args])

cardano_clusterlib/stake_pool_group.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ def get_stake_pool_id(
165165
key_args = ["--cold-verification-key-file", str(cold_vkey_file)]
166166
else:
167167
msg = "No key was specified."
168-
raise AssertionError(msg)
168+
raise ValueError(msg)
169169

170170
pool_id = (
171171
self._clusterlib_obj.cli(["stake-pool", "id", *key_args]).stdout.strip().decode("ascii")

0 commit comments

Comments
 (0)