Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/cargo/mio-0.8.11
Browse files Browse the repository at this point in the history
  • Loading branch information
jxs authored Mar 8, 2024
2 parents 1cdf6eb + 2961ee4 commit 40cdca5
Show file tree
Hide file tree
Showing 20 changed files with 515 additions and 1,165 deletions.
222 changes: 77 additions & 145 deletions Cargo.lock

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ members = [
"interop-tests",
"misc/allow-block-list",
"misc/connection-limits",
"misc/futures-bounded",
"misc/keygen",
"misc/memory-connection-limits",
"misc/metrics",
Expand Down Expand Up @@ -73,7 +72,7 @@ rust-version = "1.73.0"

[workspace.dependencies]
asynchronous-codec = { version = "0.7.0" }
futures-bounded = { version = "0.2.3", path = "misc/futures-bounded" }
futures-bounded = { version = "0.2.3" }
libp2p = { version = "0.53.2", path = "libp2p" }
libp2p-allow-block-list = { version = "0.3.0", path = "misc/allow-block-list" }
libp2p-autonat = { version = "0.12.0", path = "protocols/autonat" }
Expand All @@ -100,7 +99,7 @@ libp2p-quic = { version = "0.10.2", path = "transports/quic" }
libp2p-relay = { version = "0.17.1", path = "protocols/relay" }
libp2p-rendezvous = { version = "0.14.0", path = "protocols/rendezvous" }
libp2p-request-response = { version = "0.26.2", path = "protocols/request-response" }
libp2p-server = { version = "0.12.6", path = "misc/server" }
libp2p-server = { version = "0.12.7", path = "misc/server" }
libp2p-stream = { version = "0.1.0-alpha.1", path = "protocols/stream" }
libp2p-swarm = { version = "0.44.2", path = "swarm" }
libp2p-swarm-derive = { version = "=0.34.3", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
Expand Down
2 changes: 1 addition & 1 deletion interop-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ redis = { version = "0.23.3", default-features = false, features = [
] }
rust-embed = "8.3"
serde_json = "1"
thirtyfour = "=0.32.0-rc.8" # https://github.com/stevepryde/thirtyfour/issues/169
thirtyfour = "=0.32.0-rc.10" # https://github.com/stevepryde/thirtyfour/issues/169
tokio = { version = "1.36.0", features = ["full"] }
tower-http = { version = "0.5", features = ["cors", "fs", "trace"] }
tracing = "0.1.37"
Expand Down
23 changes: 0 additions & 23 deletions misc/futures-bounded/CHANGELOG.md

This file was deleted.

24 changes: 0 additions & 24 deletions misc/futures-bounded/Cargo.toml

This file was deleted.

Loading

0 comments on commit 40cdca5

Please sign in to comment.