lnbits-exts/nostrrelay
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

refactor: extract more methods

Browse source
This commit is contained in:
Vlad Stan 2023-02-02 09:39:12 +02:00
parent 09424b0de9
commit 80ae3db4c1
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client_manager.py
View file

@ -1,5 +1,5 @@
import json
import asyncio import asyncio
import json
from typing import Any, Callable, List, Union from typing import Any, Callable, List, Union
from fastapi import WebSocket from fastapi import WebSocket

21
tests/test_events.py
View file

@ -49,14 +49,8 @@ async def test_valid_event_crud(valid_events: List[EventFixture]):
# insert all events before doing an query # insert all events before doing an query
for f in valid_events: for f in valid_events:
event = await get_event(relay_id, f.data.id) await get_by_id(relay_id, f.data, f.name)
assert event, f"Failed to restore event (id='{f.data.id}')" await filter_by_id(relay_id, f.data, f.name)
assert event.json() != json.dumps(f.data.json()), f"Restored event is different for fixture '{f.name}'"
filter = NostrFilter(ids=[f.data.id])
events = await get_events(relay_id, filter)
assert len(events) == 1, f"Expected one filter event '{f.name}'"
assert events[0].json() != json.dumps(f.data.json()), f"FIlter event is different for fixture '{f.name}'"
author = "a24496bca5dd73300f4e5d5d346c73132b7354c597fcbb6509891747b4689211" author = "a24496bca5dd73300f4e5d5d346c73132b7354c597fcbb6509891747b4689211"
event_id = "3219eec7427e365585d5adf26f5d2dd2709d3f0f2c0e1f79dc9021e951c67d96" event_id = "3219eec7427e365585d5adf26f5d2dd2709d3f0f2c0e1f79dc9021e951c67d96"
@ -72,6 +66,17 @@ async def test_valid_event_crud(valid_events: List[EventFixture]):
await filter_by_tag_e_p_and_author(relay_id, author, event_id, reply_event_id) await filter_by_tag_e_p_and_author(relay_id, author, event_id, reply_event_id)
async def get_by_id(relay_id:str, data: NostrEvent, test_name: str):
event = await get_event(relay_id, data.id)
assert event, f"Failed to restore event (id='{data.id}')"
assert event.json() != json.dumps(data.json()), f"Restored event is different for fixture '{test_name}'"
async def filter_by_id(relay_id, data: NostrEvent, test_name: str):
filter = NostrFilter(ids=[data.id])
events = await get_events(relay_id, filter)
assert len(events) == 1, f"Expected one filter event '{test_name}'"
assert events[0].json() != json.dumps(data.json()), f"FIlter event is different for fixture '{test_name}'"
async def filter_by_tag_e_p_and_author(relay_id, author, event_id, reply_event_id): async def filter_by_tag_e_p_and_author(relay_id, author, event_id, reply_event_id):
filter = NostrFilter(authors=[author]) filter = NostrFilter(authors=[author])
filter.p.append(author) filter.p.append(author)