Merge pull request #6753 from xoriole/fix/event-stream

Add missing notifier topic observers based on enum values
Tribler · Feb 4, 2022 · f36bf3d · f36bf3d
2 parents 7a319b1 + 9df6c64
commit f36bf3d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/src/tribler-core/run_tunnel_helper.py b/src/tribler-core/run_tunnel_helper.py
@@ -146,7 +146,7 @@ async def start(self, options):
  session.set_as_default()
 
  self.log_circuits = options.log_circuits
- session.notifier.add_observer(NTFY.TUNNEL_REMOVE, self.circuit_removed)
+ session.notifier.add_observer(NTFY.TUNNEL_REMOVE.value, self.circuit_removed)
 
  await session.start_components()
 

diff --git a/src/tribler-core/tribler_core/components/payout/payout_component.py b/src/tribler-core/tribler_core/components/payout/payout_component.py
@@ -25,14 +25,15 @@ async def run(self):
  self.payout_manager = PayoutManager(bandwidth_accounting_component.community,
  ipv8_component.dht_discovery_community)
 
- self.session.notifier.add_observer(NTFY.PEER_DISCONNECTED_EVENT, self.payout_manager.do_payout)
- self.session.notifier.add_observer(NTFY.TRIBLER_TORRENT_PEER_UPDATE, self.payout_manager.update_peer)
+ self.session.notifier.add_observer(NTFY.PEER_DISCONNECTED_EVENT.value, self.payout_manager.do_payout)
+ self.session.notifier.add_observer(NTFY.TRIBLER_TORRENT_PEER_UPDATE.value, self.payout_manager.update_peer)
 
 
  async def shutdown(self):
  await super().shutdown()
  if self.payout_manager:
- self.session.notifier.remove_observer(NTFY.PEER_DISCONNECTED_EVENT, self.payout_manager.do_payout)
- self.session.notifier.remove_observer(NTFY.TRIBLER_TORRENT_PEER_UPDATE, self.payout_manager.update_peer)
+ self.session.notifier.remove_observer(NTFY.PEER_DISCONNECTED_EVENT.value, self.payout_manager.do_payout)
+ self.session.notifier.remove_observer(NTFY.TRIBLER_TORRENT_PEER_UPDATE.value,
+ self.payout_manager.update_peer)
 
  await self.payout_manager.shutdown()
diff --git a/src/tribler-core/tribler_core/components/restapi/rest/events_endpoint.py b/src/tribler-core/tribler_core/components/restapi/rest/events_endpoint.py
@@ -76,7 +76,7 @@ def connect_notifier(self, notifier: Notifier):
  self.notifier = notifier
 
  for event_type, event_lambda in reactions_dict.items():
- self.notifier.add_observer(event_type,
+ self.notifier.add_observer(event_type.value,
  lambda *args, el=event_lambda, et=event_type:
  self.write_data({"type": et.value, "event": el(*args)}))
 
@@ -91,7 +91,7 @@ def on_circuit_removed(circuit, *args):
  self.write_data({"type": NTFY.TUNNEL_REMOVE.value, "event": event})
 
  # Tribler tunnel circuit has been removed
- self.notifier.add_observer(NTFY.TUNNEL_REMOVE, on_circuit_removed)
+ self.notifier.add_observer(NTFY.TUNNEL_REMOVE.value, on_circuit_removed)
 
  async def on_shutdown(self, _):
  await self.shutdown_task_manager()

diff --git a/src/tribler-core/tribler_core/components/restapi/rest/tests/test_events_endpoint.py b/src/tribler-core/tribler_core/components/restapi/rest/tests/test_events_endpoint.py
@@ -103,9 +103,9 @@ async def test_events(rest_manager, notifier):
  messages_to_wait_for.add(NTFY.TRIBLER_EXCEPTION.value)
  for subject, data in testdata.items():
  if data:
- notifier.notify(subject, *data)
+ notifier.notify(subject.value, *data)
  else:
- notifier.notify(subject)
+ notifier.notify(subject.value)
  rest_manager.root_endpoint.endpoints['/events'].on_tribler_exception(ReportedError('', '', {}, False))
  await events_up.wait()