Skip to content

Commit

Permalink
fix: build successfully from cargo vendor tarball (#1932)
Browse files Browse the repository at this point in the history
## Description

closes #1931 

Fixes the broken build when building from the vendored tarball produced
by `cargo vendor`. The problem was with a config in `watchable v1.1.1`
and was fixed in `watchable v1.1.2`
(https://github.com/khonsulabs/watchable/releases/tag/v1.1.2).

## Notes & open questions

## Change checklist


Co-authored-by: Floris Bruynooghe <flub@n0.computer>
  • Loading branch information
cameronfyfe and flub committed Jan 8, 2024
1 parent 6aa77ae commit 2337cb2
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 6 deletions.
28 changes: 24 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion iroh-net/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ tracing = "0.1"
trust-dns-resolver = "0.23.0"
ttl_cache = "0.5.1"
url = { version = "2.4", features = ["serde"] }
watchable = "1.1.1"
watchable = "1.1.2"
webpki = { package = "rustls-webpki", version = "0.101.4", features = ["std"] }
webpki-roots = "0.25"
x509-parser = "0.15"
Expand Down
2 changes: 1 addition & 1 deletion iroh-net/src/magicsock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1263,7 +1263,7 @@ impl MagicSock {

/// Waits for local endpoints to change and returns the new ones.
pub async fn local_endpoints_change(&self) -> Result<Vec<config::Endpoint>> {
let mut watcher = self.inner.endpoints.watch();
let watcher = self.inner.endpoints.watch();
let eps = watcher.next_value_async().await?;
Ok(eps.into_iter().collect())
}
Expand Down

0 comments on commit 2337cb2

Please sign in to comment.