-
Notifications
You must be signed in to change notification settings - Fork 207
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): generalize derp
naming to relay
to prepare for future refactors
#2091
Conversation
bce1fcf
to
d28b385
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Left some quick comments regarding the CI.
name: derper |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should probably also be iroh-relay
but will break regardless. Need to update infra once it lands. Will file an issue for myself.
.github/workflows/netsim.yml
Outdated
@@ -97,7 +97,7 @@ jobs: | |||
- name: Copy binaries to right location | |||
run: | | |||
cp target/optimized-release/iroh ../chuck/netsim/bins/iroh | |||
cp target/optimized-release/derper ../chuck/netsim/bins/derper | |||
cp target/optimized-release/iroh-relay ../chuck/netsim/bins/iroh-relay |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To cheat for now you can do cp target/optimized-release/iroh-relay ../chuck/netsim/bins/derper
given commands/args have remained the same. I can do another pass to bring all the other infra in line with the rename.
.github/workflows/netsim.yml
Outdated
@@ -132,7 +132,7 @@ jobs: | |||
|
|||
- name: Cleanup | |||
run: | | |||
sudo kill -9 $(pgrep derper) || true | |||
sudo kill -9 $(pgrep iroh-relay) || true |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cheat code derper
instead of iroh-relay
The logs indicate that they fail to set up a connection (given it's mostly a rename PR, functionality should remain the same). I did a manual run and saw it trying to reach default derpers which those tests shouldn't. Which pointed me to https://github.com/n0-computer/chuck/blob/main/fixtures/derp.config.toml which we feed into the iroh binary at run time. To make things work with the current state of the PR we just need to rename We can potentially roll this back to the first version you pinged me where we had everything renamed to |
5313507
to
7312c5f
Compare
/netsim branch iroh-relay-cfg |
1 similar comment
/netsim branch iroh-relay-cfg |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And we need to update the release ci script
f1733fa
to
c8854b1
Compare
…r future refactors (#2091) ## Description We have been making breaking changes to the DERP protocol and are planning future changes that will better take advantage of / integrate with QUIC in our hole-punching schemes. ## Change checklist - [x] Self-review. - [x] Documentation updates if relevant. - [x] Tests if relevant. --------- Co-authored-by: Asmir Avdicevic <[email protected]>
Description
We have been making breaking changes to the DERP protocol and are planning future changes that will better take advantage of / integrate with QUIC in our hole-punching schemes.
Some notable changes:
CLI Config changes:
derp_nodes
->relay_nodes
API Changes
NodeAddr::with_derp_url
->NodeAddr::with_relay_url
NodeAddr::derp_url
->NodeAddr::relay_url
AddrInfo::derp_url
->AddrInfo::relay_url
DerpUrl
->RelayUrl
EndpointInfo::derp_url
->EndpointInfo::relay_url
DerpMode
->RelayMode
DerpMap
->RelayMap
MagicEndpointBuilder::derp_mode
->MagicEndpointBuilder::relay_mode
MagicEndpoint::my_derp
->MagicEndpoint::my_relay
default_eu_derp_node
->default_eu_relay_node
default_na_derp_node
->default_na_relay_node
CLI command changes
iroh-cli blob get --derp_url
->iroh-cli blob get --relay_url
iroh-cli doctor accept --local_derper
->iroh-cli doctor accept --local_relay_server
iroh-cli doctor connect --local_derper
->iroh-cli doctor connect --local_relay_server
iroh-cli doctor derp_urls
->iroh-cli doctor relay_urls
Derper Changes
iroh-relay
iroh-relay
To run a relay server:
cargo run --bin iroh-relay --features="iroh-relay"
Change checklist