Skip to content

Commit 635bad1

Browse files
authored
Merge pull request #3389 from IntersectMBO/fix_conway_ledger_4566_outcome
refactor(issues): migrate repeated certificates issue to ledger repo
2 parents 4dbd1da + c6615df commit 635bad1

File tree

3 files changed

+19
-12
lines changed

3 files changed

+19
-12
lines changed

cardano_node_tests/tests/issues.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@
55
repo="IntersectMBO/cardano-api",
66
message="Broken `nextEpochEligibleLeadershipSlots`.",
77
)
8-
api_484 = blockers.GH(
9-
issue=484,
10-
repo="IntersectMBO/cardano-api",
11-
fixed_in="10.7.0", # Unknown yet, will be fixed/changed sometime in the future
12-
message="Repeated certificates stripped from Conway transaction.",
13-
)
148
api_829 = blockers.GH(
159
issue=829,
1610
repo="IntersectMBO/cardano-api",
@@ -191,6 +185,11 @@
191185
fixed_in="8.12.0", # Unknown yet, will be fixed/changed sometime in the future
192186
message="Inconsistent listing of DRep expiry.",
193187
)
188+
ledger_4566 = blockers.GH(
189+
issue=4566,
190+
repo="IntersectMBO/cardano-ledger",
191+
message="Repeated certificates stripped from Conway transaction.",
192+
)
194193
ledger_4772 = blockers.GH(
195194
issue=4772,
196195
repo="IntersectMBO/cardano-ledger",

cardano_node_tests/tests/test_addr_registration.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,12 @@ def test_addr_registration_certificate_order(
311311
)
312312
except (clusterlib.CLIError, submit_api.SubmitApiError) as exc:
313313
str_exc = str(exc)
314-
if "(ValueNotConservedUTxO" in str_exc and VERSIONS.transaction_era >= VERSIONS.CONWAY:
315-
issues.api_484.finish_test()
314+
if "(ValueNotConservedUTxO" in str_exc:
315+
if VERSIONS.transaction_era == VERSIONS.CONWAY:
316+
# The ledger issue 4566 will not be fixed in Conway
317+
issues.ledger_4566.finish_test(force_blocked=True)
318+
if VERSIONS.transaction_era > VERSIONS.CONWAY:
319+
issues.ledger_4566.finish_test()
316320
if build_method == clusterlib_utils.BuildMethods.BUILD_EST and (
317321
"The transaction balance is negative" in str_exc
318322
or "does not balance in its use of assets" in str_exc
@@ -322,8 +326,12 @@ def test_addr_registration_certificate_order(
322326

323327
# Check that the stake address is registered
324328
stake_addr_info = cluster.g_query.get_stake_addr_info(user_registered.stake.address)
325-
if not stake_addr_info and VERSIONS.transaction_era >= VERSIONS.CONWAY:
326-
issues.api_484.finish_test()
329+
if not stake_addr_info:
330+
if VERSIONS.transaction_era == VERSIONS.CONWAY:
331+
# The ledger issue 4566 will not be fixed in Conway
332+
issues.ledger_4566.finish_test(force_blocked=True)
333+
if VERSIONS.transaction_era > VERSIONS.CONWAY:
334+
issues.ledger_4566.finish_test()
327335
assert stake_addr_info, f"Stake address is not registered: {user_registered.stake.address}"
328336

329337
# Check that the balance for source address was correctly updated and that key deposit

cardano_node_tests/utils/blockers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ def _issue_is_blocked(self) -> bool:
8282
"""Check if an issue is blocked."""
8383
return self._issue_blocked_in_version(VERSIONS.node)
8484

85-
def finish_test(self) -> None:
85+
def finish_test(self, force_blocked: bool = False) -> None:
8686
"""Fail or Xfail test with GitHub issue reference."""
8787
reason = f"{self.gh_issue}: {self.message}"
8888
log_message = f"{self.gh_issue.url} => {self.message}"
8989

90-
if self.is_blocked():
90+
if force_blocked or self.is_blocked():
9191
LOGGER.warning(f"XFAIL: {log_message}")
9292
pytest.xfail(reason)
9393
else:

0 commit comments

Comments
 (0)