refactor(iroh-net): remove unneeded async interactions with the magicsock actor #2058
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
Frando
changed the title
rklaehn
reviewed
Mar 6, 2024
iroh/src/node.rs
Outdated
| self, | ||
| req: NodeConnectionInfoRequest, | ||
| ) -> RpcResult<NodeConnectionInfoResponse> { | ||
| ) -> impl Future<Output = RpcResult<NodeConnectionInfoResponse>> { |
There was a problem hiding this comment.
why the change from async to impl Future?
There was a problem hiding this comment.
Because otherwise clippy says Warning: unused 'async' for function with no await statements. Also maybe it makes it obvious that there is no await. Can also add a clippy allow, if preferred? Don't mind.
There was a problem hiding this comment.
Changed it to return std::future::Ready directly.
There was a problem hiding this comment.
I would prefer clippy allow, with a comment why it is an async function, to avoid confusion when reading the code later
flub
approved these changes
Mar 6, 2024
Cargo.lock
Outdated
| @@ -2429,6 +2429,7 @@ dependencies = [ | |||
| "bytes", | |||
| "clap", | |||
| "criterion", | |||
| "crypto_box", | |||
There was a problem hiding this comment.
Maybe current main has this wrong after #2053
rklaehn
approved these changes
Mar 6, 2024
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.
Description
While working on #2056 I spotted that we use the actor inbox with return channels for information that is readily available already on the shared inner magicsock. This removes the unneeded complexity and thus simplifies
get_mapping_addr,endpoint_infoandendpoint_infosto return the information non-async and infallible. Yay!Notes & open questions
Change checklist