From 855ec09df3ebe2fd01d3efb1a518537156bd3679 Mon Sep 17 00:00:00 2001 From: Vlad Stan Date: Thu, 2 Feb 2023 10:26:25 +0200 Subject: [PATCH] refactor: code clean-up --- models.py | 12 +++++------- tests/test_events.py | 4 ---- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/models.py b/models.py index 7f5524e..5582179 100644 --- a/models.py +++ b/models.py @@ -20,6 +20,11 @@ class NostrRelay(BaseModel): def from_row(cls, row: Row) -> "NostrRelay": return cls(**dict(row)) +class NostrEventType(str, Enum): + EVENT = "EVENT" + REQ = "REQ" + CLOSE = "CLOSE" + class NostrEvent(BaseModel): id: str @@ -109,16 +114,9 @@ class NostrFilter(BaseModel): if len(filter_tags) == 0: return True - #filter has tag event_tag_values = [t[1] for t in event_tags if t[0] == tag_name] common_tags = [event_tag for event_tag in event_tag_values if event_tag in filter_tags] if len(common_tags) == 0: return False return True - - -class NostrEventType(str, Enum): - EVENT = "EVENT" - REQ = "REQ" - CLOSE = "CLOSE" diff --git a/tests/test_events.py b/tests/test_events.py index 04ab792..fb845cc 100644 --- a/tests/test_events.py +++ b/tests/test_events.py @@ -141,10 +141,6 @@ async def filter_by_tag_e_p_and_author(all_events: List[NostrEvent], author, eve assert filtered_events[0].id == reply_event_id, f"Failed to filter the right event by 'author' and tags 'e' & 'p'" - - - - def get_fixtures(file): """ Read the content of the JSON file.