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

chore: prune some deps #2932

Merged
merged 26 commits into from
Nov 27, 2024
Merged

chore: prune some deps #2932

merged 26 commits into from
Nov 27, 2024

Conversation

Arqu
Copy link
Collaborator

@Arqu Arqu commented Nov 14, 2024

Description

Getting started on cleaning up our deps tree as much as possible.
Closes #2883

This will continue to be an ongoing thing. We have a couple deps that are pending on releases from further deps. We've managed to clear out most of our own repos and iroh dependencies.

Breaking Changes

Notes & open questions

Change checklist

  • Self-review.
  • Documentation updates following the style guide, if relevant.
  • Tests if relevant.
  • All breaking changes documented.

@Arqu Arqu self-assigned this Nov 14, 2024
Copy link

github-actions bot commented Nov 14, 2024

Documentation for this PR has been generated and is available at: https://n0-computer.github.io/iroh/pr/2932/docs/iroh/

Last updated: 2024-11-27T10:56:53Z

Copy link

github-actions bot commented Nov 14, 2024

Netsim report & logs for this PR have been generated and is available at: LOGS
This report will remain available for 3 days.

Last updated for commit: 44d31e2

@Arqu Arqu force-pushed the arqu/deps_war branch 2 times, most recently from b82dc84 to 29c456c Compare November 18, 2024 09:38
@dignifiedquire dignifiedquire added this to the v0.29.0 milestone Nov 18, 2024
@Arqu Arqu force-pushed the arqu/deps_war branch 4 times, most recently from 314d4b0 to f5b4b44 Compare November 25, 2024 22:03
Copy link
Collaborator Author

@Arqu Arqu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤷 this is a fun one.

Cargo.toml Outdated
@@ -55,3 +55,5 @@ iroh-net = { path = "./iroh-net" }
iroh-metrics = { path = "./iroh-metrics" }
iroh-test = { path = "./iroh-test" }
iroh-router = { path = "./iroh-router" }

tokio-rustls-acme = { git = "https://github.com/n0-computer/tokio-rustls-acme", branch = "main" }
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need a release for this.

futures-lite = "2.3.0"
governor = "0.6.3"
futures-lite = "2.5"
governor = "0.6.0" #needs new release of tower_governor for 0.7.0
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have any strong mechanic to follow this on an ongoing basis. Any ideas, otherwise it's just a manual purge / update every now and then.

futures-lite = "2.3.0"
governor = "0.6.3"
futures-lite = "2.5"
governor = "0.6.3" #needs new release of tower_governor for 0.7.0
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have any great way of doing this automatically or regularly. Im open to suggestions here on how to keep track of these other than to just manually revisit every so often and do this whole dance.

netlink-sys = "0.8.6"
rtnetlink = "=0.14.1" # pinned because of https://github.com/rust-netlink/rtnetlink/issues/83

[target.'cfg(target_os = "android")'.dependencies]
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the ugly bit for android but is necessary right now unless we want to keep linux down to the same version it was because of android.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also need a way to track this too.

if let Some(dst) = get_nla!(msg, route::RouteAttribute::Destination) {
match dst {
route::RouteAddress::Inet(addr) => {
if (table == 255 || table == 254)
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I did this right but would like some extra 👀 on it @dignifiedquire

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah seems correct

@@ -100,16 +100,19 @@ impl CallbackHandler {
let mut handle = Handle::default();
let cb = Arc::new(cb);
unsafe {
windows::Win32::NetworkManagement::IpHelper::NotifyUnicastIpAddressChange(
let r = windows::Win32::NetworkManagement::IpHelper::NotifyUnicastIpAddressChange(
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is stupid but we can no longer just ? the error we have to parse it manually.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wähh

@@ -119,9 +122,12 @@ impl CallbackHandler {
handle: UnicastCallbackHandle,
) -> Result<()> {
trace!("unregistering unicast callback");
if self.unicast_callbacks.remove(&handle.0 .0).is_some() {
if self.unicast_callbacks.remove(&(handle.0 .0 as isize)).is_some() {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did a lot of casting here to get things to align and tests pass, but this is scary and I'm not a 100% confident in these.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's fine, honestly I just use as _ in this case, as these numbers depend on the lib giving you the right type anyway

@Arqu Arqu marked this pull request as ready for review November 26, 2024 15:21
@dignifiedquire
Copy link
Contributor

looks good for the most part

@dignifiedquire
Copy link
Contributor

@Arqu does this fix #2887 ?

@Arqu
Copy link
Collaborator Author

Arqu commented Nov 27, 2024

@Arqu does this fix #2887 ?

Not directly, but I can do a pass to clean it up. Let me check the other deps (blobs, docs, gossip)

@Arqu
Copy link
Collaborator Author

Arqu commented Nov 27, 2024

@Arqu does this fix #2887 ?

Not directly, but I can do a pass to clean it up. Let me check the other deps (blobs, docs, gossip)

Given CI passes this should now cover it. Our minimum version is from https://github.com/n0-computer/quinn/blob/iroh-0.11.x/Cargo.toml#L46C1-L46C52 We should probably free that up too on next release.

@Arqu Arqu added this pull request to the merge queue Nov 27, 2024
Merged via the queue into main with commit e675bba Nov 27, 2024
25 of 26 checks passed
@Arqu Arqu deleted the arqu/deps_war branch November 27, 2024 12:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

update all crates.io dependencies
2 participants