Skip to content

Commit 274aeb8

Browse files
committed
Fix tests after removal of unnecessary validation of Data
See IntersectMBO/cardano-node#4344
1 parent 07f7961 commit 274aeb8

File tree

2 files changed

+30
-9
lines changed

2 files changed

+30
-9
lines changed

Diff for: cardano_node_tests/tests/tests_plutus/test_spend_negative_build.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,11 @@ def _int_out_of_range(
521521
)
522522

523523
err_str = str(excinfo.value)
524-
assert "Value out of range within the script data" in err_str, err_str
524+
assert (
525+
"Value out of range within the script data" in err_str
526+
# see node commit 2efdd2c173bee8f2463937cebb20614adf6180f0
527+
or "Incorrect datum" in err_str
528+
), err_str
525529

526530
@allure.link(helpers.get_vcs_link())
527531
@hypothesis.given(

Diff for: cardano_node_tests/tests/tests_plutus/test_spend_negative_raw.py

+25-8
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@ def _int_out_of_range(
728728
dst_addr: clusterlib.AddressRecord,
729729
cost_per_unit: plutus_common.ExecutionCost,
730730
plutus_version: str,
731-
):
731+
) -> str:
732732
"""Try to spend a locked UTxO with redeemer int value that is not in allowed range."""
733733
redeemer_content = {}
734734
if redeemer_value % 2 == 0:
@@ -765,16 +765,19 @@ def _int_out_of_range(
765765
)
766766
]
767767

768-
with pytest.raises(clusterlib.CLIError) as excinfo:
768+
err_str = ""
769+
try:
769770
cluster_obj.g_transaction.build_raw_tx_bare(
770771
out_file=f"{temp_template}_step2_tx.body",
771772
txouts=txouts,
772773
tx_files=tx_files,
773774
fee=fee_redeem + spend_raw.FEE_REDEEM_TXSIZE,
774775
script_txins=plutus_txins,
775776
)
776-
err_str = str(excinfo.value)
777-
assert "Value out of range within the script data" in err_str, err_str
777+
except clusterlib.CLIError as exc:
778+
err_str = str(exc)
779+
780+
return err_str
778781

779782
@allure.link(helpers.get_vcs_link())
780783
@hypothesis.given(
@@ -880,7 +883,7 @@ def test_wrong_value_bellow_range(
880883
):
881884
"""Try to spend a locked UTxO with a redeemer int value < minimum allowed value.
882885
883-
Expect failure.
886+
Expect failure on node version < 1.36.0.
884887
"""
885888
temp_template = f"{common.get_test_id(cluster)}_{plutus_version}_{common.unique_time_str()}"
886889

@@ -889,7 +892,7 @@ def test_wrong_value_bellow_range(
889892
)
890893

891894
script_utxos, collateral_utxos, payment_addrs = fund_script_guessing_game
892-
self._int_out_of_range(
895+
err_str = self._int_out_of_range(
893896
cluster_obj=cluster,
894897
temp_template=temp_template,
895898
script_utxos=script_utxos,
@@ -900,6 +903,13 @@ def test_wrong_value_bellow_range(
900903
plutus_version=plutus_version,
901904
)
902905

906+
assert (
907+
# see node commit 2efdd2c173bee8f2463937cebb20614adf6180f0
908+
not err_str
909+
# on node version < 1.36.0
910+
or "Value out of range within the script data" in err_str
911+
), err_str
912+
903913
@allure.link(helpers.get_vcs_link())
904914
@hypothesis.given(redeemer_value=st.integers(min_value=common.MAX_UINT64 + 1))
905915
@hypothesis.example(redeemer_value=common.MAX_UINT64 + 1)
@@ -916,7 +926,7 @@ def test_wrong_value_above_range(
916926
):
917927
"""Try to spend a locked UTxO with a redeemer int value > maximum allowed value.
918928
919-
Expect failure.
929+
Expect failure on node version < 1.36.0.
920930
"""
921931
temp_template = f"{common.get_test_id(cluster)}_{plutus_version}_{common.unique_time_str()}"
922932

@@ -925,7 +935,7 @@ def test_wrong_value_above_range(
925935
)
926936

927937
script_utxos, collateral_utxos, payment_addrs = fund_script_guessing_game
928-
self._int_out_of_range(
938+
err_str = self._int_out_of_range(
929939
cluster_obj=cluster,
930940
temp_template=temp_template,
931941
script_utxos=script_utxos,
@@ -936,6 +946,13 @@ def test_wrong_value_above_range(
936946
plutus_version=plutus_version,
937947
)
938948

949+
assert (
950+
# see node commit 2efdd2c173bee8f2463937cebb20614adf6180f0
951+
not err_str
952+
# on node version < 1.36.0
953+
or "Value out of range within the script data" in err_str
954+
), err_str
955+
939956
@allure.link(helpers.get_vcs_link())
940957
@hypothesis.given(redeemer_value=st.binary(max_size=64))
941958
@common.hypothesis_settings(max_examples=200)

0 commit comments

Comments
 (0)