From b57b59b1bf126f81e2103812db96bf0e38928776 Mon Sep 17 00:00:00 2001 From: umgefahren <55623006+umgefahren@users.noreply.github.com> Date: Tue, 29 Nov 2022 16:34:09 +0100 Subject: [PATCH 1/3] Implemented 0.50 changes --- ping/rust/src/bin/testplan_0500.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ping/rust/src/bin/testplan_0500.rs b/ping/rust/src/bin/testplan_0500.rs index 6e602445d..770d5cc3c 100644 --- a/ping/rust/src/bin/testplan_0500.rs +++ b/ping/rust/src/bin/testplan_0500.rs @@ -12,7 +12,7 @@ async fn main() -> Result<()> { let local_key = identity::Keypair::generate_ed25519(); let local_peer_id = PeerId::from(local_key.public()); - let swarm = OrphanRuleWorkaround(Swarm::new( + let swarm = OrphanRuleWorkaround(Swarm::with_async_std_executor( development_transport(local_key).await?, Behaviour { keep_alive: keep_alive::Behaviour, From 19a8de2567ff5f14dcbbeac1758a1ca808172be1 Mon Sep 17 00:00:00 2001 From: Max Inden Date: Wed, 30 Nov 2022 14:11:39 +0100 Subject: [PATCH 2/3] Update ping/rust/src/bin/testplan_0500.rs --- ping/rust/src/bin/testplan_0500.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ping/rust/src/bin/testplan_0500.rs b/ping/rust/src/bin/testplan_0500.rs index 770d5cc3c..3e8759893 100644 --- a/ping/rust/src/bin/testplan_0500.rs +++ b/ping/rust/src/bin/testplan_0500.rs @@ -12,7 +12,7 @@ async fn main() -> Result<()> { let local_key = identity::Keypair::generate_ed25519(); let local_peer_id = PeerId::from(local_key.public()); - let swarm = OrphanRuleWorkaround(Swarm::with_async_std_executor( + let swarm = OrphanRuleWorkaround(Swarm::with_tokio_executor( development_transport(local_key).await?, Behaviour { keep_alive: keep_alive::Behaviour, From 745e41ff02d525fc65738d60b74a02f18f212233 Mon Sep 17 00:00:00 2001 From: umgefahren <55623006+umgefahren@users.noreply.github.com> Date: Wed, 30 Nov 2022 16:24:04 +0100 Subject: [PATCH 3/3] Made test plan run again --- ping/rust/Cargo.toml | 2 +- ping/rust/src/bin/testplan_0500.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ping/rust/Cargo.toml b/ping/rust/Cargo.toml index e28cf3392..f08442024 100644 --- a/ping/rust/Cargo.toml +++ b/ping/rust/Cargo.toml @@ -31,5 +31,5 @@ libp2pv0490 = { package = "libp2p", version = "0.49.0", features = ["websocket", [dependencies."libp2pv0500"] package = "libp2p" git = "https://github.com/libp2p/rust-libp2p" -rev = "368705a1465c4322948d14ee46d42475c472ca1e" # This should usually point to a commit on master. +tag = "v0.50.0" features = ["websocket", "mplex", "yamux", "tcp", "ping", "noise", "dns", "async-std", "rsa", "macros"] diff --git a/ping/rust/src/bin/testplan_0500.rs b/ping/rust/src/bin/testplan_0500.rs index 3e8759893..770d5cc3c 100644 --- a/ping/rust/src/bin/testplan_0500.rs +++ b/ping/rust/src/bin/testplan_0500.rs @@ -12,7 +12,7 @@ async fn main() -> Result<()> { let local_key = identity::Keypair::generate_ed25519(); let local_peer_id = PeerId::from(local_key.public()); - let swarm = OrphanRuleWorkaround(Swarm::with_tokio_executor( + let swarm = OrphanRuleWorkaround(Swarm::with_async_std_executor( development_transport(local_key).await?, Behaviour { keep_alive: keep_alive::Behaviour,