Skip to content

Commit c8ed901

Browse files
committed
refactor: use new add_voided_by and create del_voided_by
1 parent 51d9f3b commit c8ed901

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

hathor/transaction/base_transaction.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -562,9 +562,7 @@ def mark_partially_validated(self) -> None:
562562
"""
563563
tx_meta = self.get_metadata()
564564
assert not tx_meta.validation.is_fully_connected()
565-
if tx_meta.voided_by is None:
566-
tx_meta.voided_by = set()
567-
tx_meta.voided_by.add(settings.PARTIALLY_VALIDATED_ID)
565+
tx_meta.add_voided_by(settings.PARTIALLY_VALIDATED_ID)
568566

569567
def unmark_partially_validated(self) -> None:
570568
""" This function is used to remove the partially-validated mark from the voided-by metadata.
@@ -574,10 +572,7 @@ def unmark_partially_validated(self) -> None:
574572
"""
575573
tx_meta = self.get_metadata()
576574
assert tx_meta.validation.is_fully_connected()
577-
if tx_meta.voided_by is not None:
578-
tx_meta.voided_by.discard(settings.PARTIALLY_VALIDATED_ID)
579-
if not tx_meta.voided_by:
580-
tx_meta.voided_by = None
575+
tx_meta.del_voided_by(settings.PARTIALLY_VALIDATED_ID)
581576

582577
@abstractmethod
583578
def verify_checkpoint(self, checkpoints: List[Checkpoint]) -> None:

hathor/transaction/transaction_metadata.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,13 @@ def add_voided_by(self, item: bytes) -> None:
360360
else:
361361
self.voided_by.add(item)
362362

363+
def del_voided_by(self, item: bytes) -> None:
364+
"""Deletes `item` from `self.voided_by`. Note that this method does not save the change."""
365+
if self.voided_by is not None:
366+
self.voided_by.discard(item)
367+
if not self.voided_by:
368+
self.voided_by = None
369+
363370
def get_soft_height(self) -> int:
364371
""" Returns the soft-height, which is either the soft_height or height metadata.
365372

0 commit comments

Comments
 (0)