AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #10239 from SomberNight/202509_tests_clear_callbacks

Browse Source 
tests: clear util.callback_mgr between test cases
This commit is contained in:
ghost43
2025-09-26 16:18:49 +00:00
committed by GitHub
parent fd0ad25775 5d1df96020
commit 2ec6c3bd46
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
electrum/util.py
View File

@@ -1953,20 +1953,24 @@ class CallbackManager(Logger):
def __init__(self): def __init__(self):
Logger.__init__(self) Logger.__init__(self)
self.callback_lock = threading.Lock() self.callback_lock = threading.Lock()
self.callbacks = defaultdict(list) # note: needs self.callback_lock self.callbacks = defaultdict(list) # type: Dict[str, List[Callable]] # note: needs self.callback_lock
def register_callback(self, func, events): def register_callback(self, func: Callable, events: Sequence[str]) -> None:
with self.callback_lock: with self.callback_lock:
for event in events: for event in events:
self.callbacks[event].append(func) self.callbacks[event].append(func)
def unregister_callback(self, callback): def unregister_callback(self, callback: Callable) -> None:
with self.callback_lock: with self.callback_lock:
for callbacks in self.callbacks.values(): for callbacks in self.callbacks.values():
if callback in callbacks: if callback in callbacks:
callbacks.remove(callback) callbacks.remove(callback)
def trigger_callback(self, event, *args): def clear_all_callbacks(self) -> None:
with self.callback_lock:
self.callbacks.clear()
def trigger_callback(self, event: str, *args) -> None:
"""Trigger a callback with given arguments. """Trigger a callback with given arguments.
Can be called from any thread. The callback itself will get scheduled Can be called from any thread. The callback itself will get scheduled
on the event loop. on the event loop.

1
tests/__init__.py
View File

@@ -75,6 +75,7 @@ class ElectrumTestCase(unittest.IsolatedAsyncioTestCase, Logger):
util._asyncio_event_loop = loop util._asyncio_event_loop = loop
def tearDown(self): def tearDown(self):
util.callback_mgr.clear_all_callbacks()
shutil.rmtree(self.electrum_path) shutil.rmtree(self.electrum_path)
super().tearDown() super().tearDown()
util._asyncio_event_loop = None # cleared here, at the ~last possible moment. asyncTearDown is too early. util._asyncio_event_loop = None # cleared here, at the ~last possible moment. asyncTearDown is too early.

16
tests/test_lnpeer.py
View File

@@ -1117,12 +1117,8 @@ class TestPeerDirect(TestPeer):
util.register_callback(on_htlc_fulfilled, ["htlc_fulfilled"]) util.register_callback(on_htlc_fulfilled, ["htlc_fulfilled"])
util.register_callback(on_htlc_failed, ["htlc_failed"]) util.register_callback(on_htlc_failed, ["htlc_failed"])
try: with self.assertRaises(SuccessfulTest):
with self.assertRaises(SuccessfulTest): await f()
await f()
finally:
util.unregister_callback(on_htlc_fulfilled)
util.unregister_callback(on_htlc_failed)
async def test_payment_recv_mpp_confusion2(self): async def test_payment_recv_mpp_confusion2(self):
"""Regression test for https://github.com/spesmilo/electrum/security/advisories/GHSA-8r85-vp7r-hjxf""" """Regression test for https://github.com/spesmilo/electrum/security/advisories/GHSA-8r85-vp7r-hjxf"""
@@ -1191,12 +1187,8 @@ class TestPeerDirect(TestPeer):
util.register_callback(on_htlc_fulfilled, ["htlc_fulfilled"]) util.register_callback(on_htlc_fulfilled, ["htlc_fulfilled"])
util.register_callback(on_htlc_failed, ["htlc_failed"]) util.register_callback(on_htlc_failed, ["htlc_failed"])
try: with self.assertRaises(SuccessfulTest):
with self.assertRaises(SuccessfulTest): await f()
await f()
finally:
util.unregister_callback(on_htlc_fulfilled)
util.unregister_callback(on_htlc_failed)
async def test_legacy_shutdown_low(self): async def test_legacy_shutdown_low(self):
await self._test_shutdown(alice_fee=100, bob_fee=150) await self._test_shutdown(alice_fee=100, bob_fee=150)