Create ListenersEvent::Closed on Swarm::remove_listener #2261
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
elenaf9
force-pushed
the
core/close-listener
branch
from
74eaef5
to
0efe82c
Compare
core/src/connection/listeners.rs
Outdated
| let listener_project = listener.as_mut().project(); | ||
| self.pending_events.push_back(ListenersEvent::Closed { | ||
| listener_id: *listener_project.id, | ||
| addresses: listener_project.addresses.drain(..).collect(), |
There was a problem hiding this comment.
Would std::mem::replace also work here? Slightly more readable IMO.
mxinden
approved these changes
Oct 9, 2021
|
Giving others a chance to comment on the latest changes. Will merge early next week in case there are no further comments. |
|
Thanks @elenaf9! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Discussion #2113.
Create a
ListenersEvent::Closedwhen a listener is removed viaSwarm::remove_listener.This makes it more consistent with
Swarm::listen_on, and also informs the Swarm about the associated expired addresses.I initially tried to realize it via a
Streamimplementation on theconnection::Listener, so that it would just returnPoll::Ready(None)if the listener was removed (see this commit). But due to Listener being wrapped in aPinit is a bit more complicated, whereas this Draft now is only a very minimal change.Note: 0efe82c introduces a minor API change so that
remove_listenerreturns a boolean instead ofResult<(), ()>. This 1. more consistent with other methods likeremove_external_address, and 2. follows the clippy lint of result_unit_err.