Skip to content

Commit 3683098

Browse files
authored
Merge branch 'master' into refactor/serializable-record
2 parents dad3b1d + 8c8b3c3 commit 3683098

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+364
-290
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ jobs:
308308
RUSTFLAGS: ''
309309
steps:
310310
- uses: actions/checkout@v4
311-
- run: wget -q -O- https://github.com/obi1kenobi/cargo-semver-checks/releases/download/v0.36.0/cargo-semver-checks-x86_64-unknown-linux-gnu.tar.gz | tar -xz -C ~/.cargo/bin
311+
- run: wget -q -O- https://github.com/obi1kenobi/cargo-semver-checks/releases/download/v0.39.0/cargo-semver-checks-x86_64-unknown-linux-gnu.tar.gz | tar -xz -C ~/.cargo/bin
312312
shell: bash
313313
- uses: obi1kenobi/cargo-semver-checks-action@7272cc2caa468d3e009a2b0a9cc366839348237b # v2.6
314314

Cargo.lock

+99-18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -79,27 +79,27 @@ libp2p-connection-limits = { version = "0.5.1", path = "misc/connection-limits"
7979
libp2p-core = { version = "0.43.0", path = "core" }
8080
libp2p-dcutr = { version = "0.13.0", path = "protocols/dcutr" }
8181
libp2p-dns = { version = "0.43.0", path = "transports/dns" }
82-
libp2p-floodsub = { version = "0.46.0", path = "protocols/floodsub" }
82+
libp2p-floodsub = { version = "0.46.1", path = "protocols/floodsub" }
8383
libp2p-gossipsub = { version = "0.48.1", path = "protocols/gossipsub" }
8484
libp2p-identify = { version = "0.46.0", path = "protocols/identify" }
8585
libp2p-identity = { version = "0.2.10" }
8686
libp2p-kad = { version = "0.47.0", path = "protocols/kad" }
8787
libp2p-mdns = { version = "0.47.0", path = "protocols/mdns" }
8888
libp2p-memory-connection-limits = { version = "0.4.0", path = "misc/memory-connection-limits" }
89-
libp2p-metrics = { version = "0.16.0", path = "misc/metrics" }
90-
libp2p-mplex = { version = "0.43.0", path = "muxers/mplex" }
89+
libp2p-metrics = { version = "0.16.1", path = "misc/metrics" }
90+
libp2p-mplex = { version = "0.43.1", path = "muxers/mplex" }
9191
libp2p-noise = { version = "0.46.0", path = "transports/noise" }
9292
libp2p-perf = { version = "0.4.0", path = "protocols/perf" }
9393
libp2p-ping = { version = "0.46.0", path = "protocols/ping" }
9494
libp2p-plaintext = { version = "0.43.0", path = "transports/plaintext" }
9595
libp2p-pnet = { version = "0.26.0", path = "transports/pnet" }
9696
libp2p-quic = { version = "0.12.0", path = "transports/quic" }
97-
libp2p-relay = { version = "0.19.1", path = "protocols/relay" }
97+
libp2p-relay = { version = "0.20.0", path = "protocols/relay" }
9898
libp2p-rendezvous = { version = "0.16.0", path = "protocols/rendezvous" }
9999
libp2p-request-response = { version = "0.28.1", path = "protocols/request-response" }
100100
libp2p-server = { version = "0.12.6", path = "misc/server" }
101101
libp2p-stream = { version = "0.3.0-alpha", path = "protocols/stream" }
102-
libp2p-swarm = { version = "0.46.0", path = "swarm" }
102+
libp2p-swarm = { version = "0.47.0", path = "swarm" }
103103
libp2p-swarm-derive = { version = "=0.35.1", 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.
104104
libp2p-swarm-test = { version = "0.5.0", path = "swarm-test" }
105105
libp2p-tcp = { version = "0.43.0", path = "transports/tcp" }
@@ -109,7 +109,7 @@ libp2p-upnp = { version = "0.4.0", path = "protocols/upnp" }
109109
libp2p-webrtc = { version = "0.9.0-alpha", path = "transports/webrtc" }
110110
libp2p-webrtc-utils = { version = "0.4.0", path = "misc/webrtc-utils" }
111111
libp2p-webrtc-websys = { version = "0.4.0", path = "transports/webrtc-websys" }
112-
libp2p-websocket = { version = "0.45.0", path = "transports/websocket" }
112+
libp2p-websocket = { version = "0.45.1", path = "transports/websocket" }
113113
libp2p-websocket-websys = { version = "0.5.0", path = "transports/websocket-websys" }
114114
libp2p-webtransport-websys = { version = "0.5.0", path = "transports/webtransport-websys" }
115115
libp2p-yamux = { version = "0.47.0", path = "muxers/yamux" }

ROADMAP.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Below is a high level roadmap for the rust-libp2p project.
44
Items are ordered by priority (high to low).
55

6-
This is a living document.
6+
This is a living document. We believe the roadmap should be shaped by the needs of our user community. Many of the items below are contributions made by downstream users.
77
Input is always welcome e.g. via GitHub issues or pull requests.
88

99
This is the roadmap of the Rust implementation of libp2p.

core/tests/transport_upgrade.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use libp2p_core::{
2727
Endpoint,
2828
};
2929
use libp2p_identity as identity;
30-
use libp2p_mplex::MplexConfig;
30+
use libp2p_mplex::Config;
3131
use libp2p_noise as noise;
3232
use multiaddr::{Multiaddr, Protocol};
3333
use rand::random;
@@ -89,7 +89,7 @@ async fn upgrade_pipeline() {
8989
.apply(HelloUpgrade {})
9090
.apply(HelloUpgrade {})
9191
.apply(HelloUpgrade {})
92-
.multiplex(MplexConfig::default())
92+
.multiplex(Config::default())
9393
.boxed();
9494

9595
let dialer_keys = identity::Keypair::generate_ed25519();
@@ -100,7 +100,7 @@ async fn upgrade_pipeline() {
100100
.apply(HelloUpgrade {})
101101
.apply(HelloUpgrade {})
102102
.apply(HelloUpgrade {})
103-
.multiplex(MplexConfig::default())
103+
.multiplex(Config::default())
104104
.boxed();
105105

106106
let listen_addr1 = Multiaddr::from(Protocol::Memory(random::<u64>()));

0 commit comments

Comments
 (0)