-
Notifications
You must be signed in to change notification settings - Fork 184
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
refactor(iroh-net)!: Move relay implemention in iroh-net
behind iroh-relay
cfg flag
#2516
Merged
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
…oh-relay` cfg flag
flub
approved these changes
Jul 16, 2024
Co-authored-by: Floris Bruynooghe <flub@n0.computer>
Co-authored-by: Floris Bruynooghe <flub@n0.computer>
3 tasks
github-merge-queue bot
pushed a commit
that referenced
this pull request
Jul 31, 2024
… flag (#2566) ## Description <!-- A summary of what this pull request achieves and a rough list of changes. --> This moves more relay server code behind the `iroh-relay` feature flag. This is a continuation of #2516 Unfortunately I didn't quite catch "all server things". I'm fairly confident I do have all covered now, because this is extracted from a branch where server-side code wouldn't compile (to Wasm). Also: - Makes use of `MaybeTlsStream` instead of the `MaybeTlsStreamServer` alias. Using the original definition instead of the alias confuses rust-analyzer a lot less. And the aliasing back-and-forth was silly. ## Breaking Changes <!-- Optional, if there are any breaking changes document them, including how to migrate older code. --> None ## Notes & open questions <!-- Any notes, remarks or open questions you have to make about the PR. --> ## Change checklist - [x] Self-review. - [x] Documentation updates following the [style guide](https://rust-lang.github.io/rfcs/1574-more-api-documentation-conventions.html#appendix-a-full-conventions-text), if relevant. - ~~[ ] Tests if relevant.~~ - [x] All breaking changes documented.
matheus23
added a commit
that referenced
this pull request
Nov 14, 2024
…oh-relay` cfg flag (#2516) ## Description We had an `iroh-relay` cfg flag, but it was unused. Enabling it is useful for working towards building iroh-net for Wasm (we won't be able to compile the server bits to Wasm, sorry :stuck_out_tongue: ) This moves the `axum` and `tokio-rustls-acme` dependencies behind that feature flag as well as the modules `iroh_net::relay::http::server` and `iroh_net::relay::iroh_relay`. I also had to move the `relay::http::server::Protocol` one module up. ## Breaking Changes - iroh-relay *implementation*-specific features are now behind an `iroh-relay` feature flag in iroh-net. ## Notes & open questions LMK! ## Change checklist - [X] Self-review. - ~~[ ] Documentation updates following the [style guide](https://rust-lang.github.io/rfcs/1574-more-api-documentation-conventions.html#appendix-a-full-conventions-text), if relevant.~~ - ~~[ ] Tests if relevant.~~ I ran `cargo test -p iroh-net`. That enables the `iroh-relay` feature and runs successfully. - [X] All breaking changes documented. --------- Co-authored-by: Floris Bruynooghe <flub@n0.computer>
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
We had an
iroh-relay
cfg flag, but it was unused.Enabling it is useful for working towards building iroh-net for Wasm (we won't be able to compile the server bits to Wasm, sorry 😛 )
This moves the
axum
andtokio-rustls-acme
dependencies behind that feature flag as well as the modulesiroh_net::relay::http::server
andiroh_net::relay::iroh_relay
.I also had to move the
relay::http::server::Protocol
one module up.Breaking Changes
iroh-relay
feature flag in iroh-net.Notes & open questions
LMK!
Change checklist
[ ] Documentation updates following the style guide, if relevant.[ ] Tests if relevant.I rancargo test -p iroh-net
. That enables theiroh-relay
feature and runs successfully.