From 87ab49e8122c9b8daa083bf02816b5ad92453f7a Mon Sep 17 00:00:00 2001 From: Hannes <55623006+umgefahren@users.noreply.github.com> Date: Wed, 5 Oct 2022 22:23:50 +0200 Subject: [PATCH] protocols/mdns: Update to if-watch v2.0.0 (#2978) --- examples/chat-tokio.rs | 2 +- examples/chat.rs | 4 ++-- examples/distributed-key-value-store.rs | 4 ++-- examples/mdns-passive-discovery.rs | 2 +- protocols/mdns/CHANGELOG.md | 3 +++ protocols/mdns/Cargo.toml | 2 +- protocols/mdns/src/behaviour.rs | 7 +++---- protocols/mdns/tests/use-async-std.rs | 2 +- protocols/mdns/tests/use-tokio.rs | 2 +- 9 files changed, 15 insertions(+), 13 deletions(-) diff --git a/examples/chat-tokio.rs b/examples/chat-tokio.rs index 72778e75128..2578d106ff3 100644 --- a/examples/chat-tokio.rs +++ b/examples/chat-tokio.rs @@ -105,7 +105,7 @@ async fn main() -> Result<(), Box> { // Create a Swarm to manage peers and events. let mut swarm = { - let mdns = TokioMdns::new(Default::default()).await?; + let mdns = TokioMdns::new(Default::default())?; let mut behaviour = MyBehaviour { floodsub: Floodsub::new(peer_id), mdns, diff --git a/examples/chat.rs b/examples/chat.rs index 082840ef7e9..e5368b49e80 100644 --- a/examples/chat.rs +++ b/examples/chat.rs @@ -49,7 +49,7 @@ //! //! The two nodes then connect. -use async_std::{io, task}; +use async_std::io; use futures::{ prelude::{stream::StreamExt, *}, select, @@ -108,7 +108,7 @@ async fn main() -> Result<(), Box> { // Create a Swarm to manage peers and events let mut swarm = { - let mdns = task::block_on(Mdns::new(MdnsConfig::default()))?; + let mdns = Mdns::new(MdnsConfig::default())?; let mut behaviour = MyBehaviour { floodsub: Floodsub::new(local_peer_id), mdns, diff --git a/examples/distributed-key-value-store.rs b/examples/distributed-key-value-store.rs index 7fef717cf78..de02ddf81be 100644 --- a/examples/distributed-key-value-store.rs +++ b/examples/distributed-key-value-store.rs @@ -40,7 +40,7 @@ //! //! 4. Close with Ctrl-c. -use async_std::{io, task}; +use async_std::io; use futures::{prelude::*, select}; use libp2p::kad::record::store::MemoryStore; use libp2p::kad::{ @@ -96,7 +96,7 @@ async fn main() -> Result<(), Box> { // Create a Kademlia behaviour. let store = MemoryStore::new(local_peer_id); let kademlia = Kademlia::new(local_peer_id, store); - let mdns = task::block_on(Mdns::new(MdnsConfig::default()))?; + let mdns = Mdns::new(MdnsConfig::default())?; let behaviour = MyBehaviour { kademlia, mdns }; Swarm::new(transport, behaviour, local_peer_id) }; diff --git a/examples/mdns-passive-discovery.rs b/examples/mdns-passive-discovery.rs index a63ec7d5afe..9ac7e1a45a0 100644 --- a/examples/mdns-passive-discovery.rs +++ b/examples/mdns-passive-discovery.rs @@ -40,7 +40,7 @@ async fn main() -> Result<(), Box> { let transport = libp2p::development_transport(id_keys).await?; // Create an MDNS network behaviour. - let behaviour = Mdns::new(MdnsConfig::default()).await?; + let behaviour = Mdns::new(MdnsConfig::default())?; // Create a Swarm that establishes connections through the given transport. // Note that the MDNS behaviour itself will not actually inititiate any connections, diff --git a/protocols/mdns/CHANGELOG.md b/protocols/mdns/CHANGELOG.md index 0943140dd02..915564341ae 100644 --- a/protocols/mdns/CHANGELOG.md +++ b/protocols/mdns/CHANGELOG.md @@ -10,9 +10,12 @@ - Removed the `lazy_static` dependency. See [PR 2977]. +- Update to `if-watch` `v2.0.0` and thus the `async` method `Mdns::new` and `TokioMdns::new` becomes synchronous. See [PR 2978]. + [PR 2918]: https://github.com/libp2p/rust-libp2p/pull/2918 [PR 2939]: https://github.com/libp2p/rust-libp2p/pull/2939 [PR 2977]: https://github.com/libp2p/rust-libp2p/pull/2977 +[PR 2978]: https://github.com/libp2p/rust-libp2p/pull/2978 # 0.40.0 diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml index 8102e6d28ec..2663c76f820 100644 --- a/protocols/mdns/Cargo.toml +++ b/protocols/mdns/Cargo.toml @@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"] data-encoding = "2.3.2" dns-parser = "0.8.0" futures = "0.3.13" -if-watch = "1.1.1" +if-watch = "2.0.0" libp2p-core = { version = "0.37.0", path = "../../core" } libp2p-swarm = { version = "0.40.0", path = "../../swarm" } log = "0.4.14" diff --git a/protocols/mdns/src/behaviour.rs b/protocols/mdns/src/behaviour.rs index e6c7e67981a..b19845ac1d7 100644 --- a/protocols/mdns/src/behaviour.rs +++ b/protocols/mdns/src/behaviour.rs @@ -25,7 +25,6 @@ mod timer; use self::iface::InterfaceState; use crate::behaviour::{socket::AsyncSocket, timer::Builder}; use crate::MdnsConfig; -use futures::prelude::*; use futures::Stream; use if_watch::{IfEvent, IfWatcher}; use libp2p_core::transport::ListenerId; @@ -81,8 +80,8 @@ where T: Builder, { /// Builds a new `Mdns` behaviour. - pub async fn new(config: MdnsConfig) -> io::Result { - let if_watch = if_watch::IfWatcher::new().await?; + pub fn new(config: MdnsConfig) -> io::Result { + let if_watch = if_watch::IfWatcher::new()?; Ok(Self { config, if_watch, @@ -169,7 +168,7 @@ where params: &mut impl PollParameters, ) -> Poll> { // Poll ifwatch. - while let Poll::Ready(event) = Pin::new(&mut self.if_watch).poll(cx) { + while let Poll::Ready(Some(event)) = Pin::new(&mut self.if_watch).poll_next(cx) { match event { Ok(IfEvent::Up(inet)) => { let addr = inet.addr(); diff --git a/protocols/mdns/tests/use-async-std.rs b/protocols/mdns/tests/use-async-std.rs index 1bd311dbcbe..2ddb36355be 100644 --- a/protocols/mdns/tests/use-async-std.rs +++ b/protocols/mdns/tests/use-async-std.rs @@ -61,7 +61,7 @@ async fn create_swarm(config: MdnsConfig) -> Result, Box> let id_keys = identity::Keypair::generate_ed25519(); let peer_id = PeerId::from(id_keys.public()); let transport = libp2p::development_transport(id_keys).await?; - let behaviour = Mdns::new(config).await?; + let behaviour = Mdns::new(config)?; let mut swarm = Swarm::new(transport, behaviour, peer_id); swarm.listen_on("/ip4/0.0.0.0/tcp/0".parse()?)?; Ok(swarm) diff --git a/protocols/mdns/tests/use-tokio.rs b/protocols/mdns/tests/use-tokio.rs index 040b32a984e..830557d3f00 100644 --- a/protocols/mdns/tests/use-tokio.rs +++ b/protocols/mdns/tests/use-tokio.rs @@ -57,7 +57,7 @@ async fn create_swarm(config: MdnsConfig) -> Result, Box