Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MatrixTransport.send_global method #3436

Merged
merged 4 commits into from
Feb 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions raiden/network/transport/matrix/transport.py
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,33 @@ def send_async(

self._send_with_retry(queue_identifier, message)

def send_global(self, room: str, message: Message) -> None:
"""Sends a message to one of the global rooms

These rooms aren't being listened on and therefore no reply could be heard, so these
messages are sent in a send-and-forget async way.
The actual room name is composed from the suffix given as parameter and chain name or id
e.g.: raiden_ropsten_discovery
Params:
room: name suffix as passed in config['global_rooms'] list
message: Message instance to be serialized and sent
"""
room_name = self._make_room_alias(room)
assert self._global_rooms.get(room_name), f'Unknown global room: {room_name!r}'

def _send_global():
text = JSONSerializer.serialize(message)
room = self._global_rooms[room_name]
self.log.debug(
'Send global',
room_name=room_name,
room=room,
data=text.replace('\n', '\\n'),
)
room.send_text(text)

self._spawn(_send_global)

@property
def _queueids_to_queues(self) -> QueueIdsToQueues:
chain_state = views.state_from_raiden(self._raiden_service)
Expand Down
8 changes: 8 additions & 0 deletions raiden/network/transport/udp/udp_transport.py
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,14 @@ def send_async(
message=message,
)

def send_global(
self,
room: str,
message: Message,
) -> None:
""" This method exists only for interface compatibility with MatrixTransport """
self.log.warning('UDP is unable to send global messages. Ignoring')

def maybe_send(self, recipient: typing.Address, message: Message):
""" Send message to recipient if the transport is running. """

Expand Down
47 changes: 47 additions & 0 deletions raiden/tests/integration/test_matrix_transport.py
Original file line number Diff line number Diff line change
Expand Up @@ -526,3 +526,50 @@ def test_matrix_discovery_room_offline_server(

transport.stop()
transport.get()


def test_matrix_send_global(
local_matrix_servers,
retries_before_backoff,
retry_interval,
private_rooms,
):
transport = MatrixTransport({
'global_rooms': ['discovery', 'monitoring'],
'retries_before_backoff': retries_before_backoff,
'retry_interval': retry_interval,
'server': local_matrix_servers[0],
'server_name': local_matrix_servers[0].netloc,
'available_servers': [local_matrix_servers[0]],
'private_rooms': private_rooms,
})
transport.start(MockRaidenService(None), MessageHandler(set()), '')
gevent.idle()

ms_room_name = transport._make_room_alias('monitoring')
ms_room = transport._global_rooms.get(ms_room_name)
assert isinstance(ms_room, Room)

ms_room.send_text = MagicMock(spec=ms_room.send_text)

for i in range(5):
message = Processed(i)
transport._raiden_service.sign(message)
transport.send_global(
'monitoring',
message,
)

gevent.idle()

assert ms_room.send_text.call_count == 5

# unknown room suffix is an error
with pytest.raises(AssertionError):
transport.send_global(
'unknown_suffix',
Processed(10),
)

transport.stop()
transport.get()