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.

Sign up for GitHub

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-sync): move replica event channels to iroh_sync, track open/close state of replicas #1640

Merged
merged 6 commits into from
Oct 16, 2023
Merged

refactor(iroh-sync): move replica event channels to iroh_sync, track open/close state of replicas #1640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
56694e5
deps: update flume to 0.11 to use Sender::same_channel
Frando Oct 16, 2023
6091768
refactor: move replica event channels to iroh_sync, track open/close …
Frando Oct 16, 2023
bdd777a
fix: sync example, and better SyncEngine::subscribe method
Frando Oct 16, 2023
b8eb3f8
fix: channel caps
Frando Oct 16, 2023
9330546
cleanpus
Frando Oct 16, 2023
051ca33
fix: cleanups after review
Frando Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion iroh-bytes/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ bytes = { version = "1.4", features = ["serde"] }
chrono = "0.4.31"
data-encoding = "2.3.3"
derive_more = { version = "1.0.0-beta.1", features = ["debug", "display", "from", "try_into", "into"] }
flume = "0.10.14"
flume = "0.11"
futures = "0.3.25"
genawaiter = { version = "0.99.1", features = ["futures03"] }
hex = "0.4.3"
Expand Down
2 changes: 1 addition & 1 deletion iroh-gossip/src/net.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ async fn wait_for_neighbor_up(mut sub: broadcast::Receiver<Event>) -> anyhow::Re
Ok(Event::NeighborUp(_neighbor)) => break Ok(()),
Ok(_) | Err(broadcast::error::RecvError::Lagged(_)) => {}
Err(broadcast::error::RecvError::Closed) => {
break Err(anyhow!("Failed to join swarm: Gossip actor dropped"))
break Err(anyhow!("Failed to join swarm: channel closed"))
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion iroh-net/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ data-encoding = "2.3.3"
der = { version = "0.7", features = ["alloc", "derive"] }
derive_more = { version = "1.0.0-beta.1", features = ["debug", "display", "from", "try_into", "deref"] }
ed25519-dalek = { version = "2.0.0", features = ["serde", "rand_core"] }
flume = "0.10.14"
flume = "0.11"
futures = "0.3.25"
governor = "0.6.0"
hex = "0.4.3"
Expand Down
2 changes: 1 addition & 1 deletion iroh-sync/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ crossbeam = "0.8.2"
data-encoding = "2.4.0"
derive_more = { version = "1.0.0-beta.1", features = ["debug", "deref", "display", "from", "try_into", "into", "as_ref"] }
ed25519-dalek = { version = "2.0.0", features = ["serde", "rand_core"] }
flume = "0.10"
flume = "0.11"
iroh-bytes = { version = "0.7.0", path = "../iroh-bytes" }
iroh-metrics = { version = "0.7.0", path = "../iroh-metrics", optional = true }
once_cell = "1.18.0"
Expand Down
Loading