Merge branch 'gossipsub_private' of github.com:tcoratger/rust-libp2p into gossipsub_private

Author: thomaseizinger

.github/workflows/ci.yml

@@ -253,7 +253,7 @@ jobs:
       - run: cargo install --version 0.10.0 pb-rs --locked
 
       - name: Glob match
-        uses: tj-actions/glob@v16
+        uses: tj-actions/glob@v17
         id: glob
         with:
           files: |

interop-tests/ping-version.json

@@ -5,7 +5,7 @@
     "ws",
     "tcp",
     "quic-v1",
-    "webrtc"
+    "webrtc-direct"
   ],
   "secureChannels": [
     "tls",

interop-tests/src/bin/ping.rs

@@ -70,7 +70,7 @@ async fn main() -> Result<()> {
                 .boxed(),
             format!("/ip4/{ip}/tcp/0/ws"),
         ),
-        Transport::Webrtc => (
+        Transport::WebRtcDirect => (
             webrtc::tokio::Transport::new(
                 local_key,
                 webrtc::tokio::Certificate::generate(&mut rand::thread_rng())?,
@@ -213,7 +213,7 @@ fn muxer_protocol_from_env() -> Result<Either<yamux::YamuxConfig, mplex::MplexCo
 pub enum Transport {
     Tcp,
     QuicV1,
-    Webrtc,
+    WebRtcDirect,
     Ws,
 }
 
@@ -224,7 +224,7 @@ impl FromStr for Transport {
         Ok(match s {
             "tcp" => Self::Tcp,
             "quic-v1" => Self::QuicV1,
-            "webrtc" => Self::Webrtc,
+            "webrtc-direct" => Self::WebRtcDirect,
             "ws" => Self::Ws,
             other => bail!("unknown transport {other}"),
         })

protocols/gossipsub/src/subscription_filter_priv.rs

@@ -213,6 +213,7 @@ impl TopicSubscriptionFilter for RegexSubscriptionFilter {
 mod test {
     use super::*;
     use crate::types::SubscriptionAction::*;
+    use regex::Regex;
     use std::iter::FromIterator;
 
     #[test]

protocols/relay/tests/lib.rs

@@ -210,12 +210,16 @@ fn connect() {
     src.dial(dst_addr).unwrap();
 
     pool.run_until(futures::future::join(
-        connection_established_to(src, relay_peer_id, dst_peer_id),
-        connection_established_to(dst, relay_peer_id, src_peer_id),
+        connection_established_to(&mut src, relay_peer_id, dst_peer_id),
+        connection_established_to(&mut dst, relay_peer_id, src_peer_id),
     ));
 }
 
-async fn connection_established_to(mut swarm: Swarm<Client>, relay_peer_id: PeerId, other: PeerId) {
+async fn connection_established_to(
+    swarm: &mut Swarm<Client>,
+    relay_peer_id: PeerId,
+    other: PeerId,
+) {
     loop {
         match swarm.select_next_some().await {
             SwarmEvent::Dialing(peer_id) if peer_id == relay_peer_id => {}