Merge branch 'master' of github.com:libp2p/rust-libp2p into identify-remove-io-behaviour

jxs · jxs · commit a84178feabef · 2022-12-09T20:35:39.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,6 +45,15 @@
 
 # `libp2p` facade crate
 
+# 0.51.0 [unreleased]
+
+- Remove `SimpleProtocol` due to being unused. See [`libp2p::core::upgrade`](https://docs.rs/libp2p/0.50.0/libp2p/core/upgrade/index.html) for alternatives. See [PR 3191].
+
+- Update individual crates.
+  - Update to [`libp2p-swarm` `v0.42.0`](swarm/CHANGELOG.md#0420).
+
+[PR 3191]: https://github.com/libp2p/rust-libp2p/pull/3191
+
 # 0.50.0
 
 This is a large release. After > 4 years, rust-libp2p ships with an [(alpha) QUIC
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p"
 edition = "2021"
 rust-version = "1.62.0"
 description = "Peer-to-peer networking library"
-version = "0.50.0"
+version = "0.51.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -107,7 +107,7 @@ libp2p-pnet = { version = "0.22.2", path = "transports/pnet", optional = true }
 libp2p-relay = { version = "0.14.0", path = "protocols/relay", optional = true }
 libp2p-rendezvous = { version = "0.11.0", path = "protocols/rendezvous", optional = true }
 libp2p-request-response = { version = "0.23.0", path = "protocols/request-response", optional = true }
-libp2p-swarm = { version = "0.41.0", path = "swarm" }
+libp2p-swarm = { version = "0.42.0", path = "swarm" }
 libp2p-uds = { version = "0.37.0", path = "transports/uds", optional = true }
 libp2p-wasm-ext = { version = "0.38.0", path = "transports/wasm-ext", optional = true }
 libp2p-yamux = { version = "0.42.0", path = "muxers/yamux", optional = true }
diff --git a/misc/metrics/Cargo.toml b/misc/metrics/Cargo.toml
@@ -25,7 +25,7 @@ libp2p-identify = { version = "0.41.0", path = "../../protocols/identify", optio
 libp2p-kad = { version = "0.42.0", path = "../../protocols/kad", optional = true }
 libp2p-ping = { version = "0.41.0", path = "../../protocols/ping", optional = true }
 libp2p-relay =  { version = "0.14.0", path = "../../protocols/relay", optional = true }
-libp2p-swarm = { version = "0.41.0", path = "../../swarm" }
+libp2p-swarm = { version = "0.42.0", path = "../../swarm" }
 prometheus-client = "0.18.0"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
@@ -39,7 +39,7 @@ libp2p = { path = "../..", features = ["full"] }
 hyper = { version="0.14", features = ["server", "tcp", "http1"] }
 tokio = { version = "1", features = ["rt-multi-thread"] }
 
-# Passing arguments to the docsrs builder in order to properly document cfg's. 
+# Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml
@@ -19,7 +19,7 @@ futures = "0.3"
 futures-timer = "3.0"
 instant = "0.1"
 libp2p-core = { version = "0.38.0", path = "../../core" }
-libp2p-swarm = { version = "0.41.0", path = "../../swarm" }
+libp2p-swarm = { version = "0.42.0", path = "../../swarm" }
 libp2p-request-response = { version = "0.23.0", path = "../request-response" }
 log = "0.4"
 rand = "0.8"
@@ -31,7 +31,7 @@ env_logger = "0.10"
 clap = { version = "4.0.13", features = ["derive"] }
 libp2p = { path = "../..", features = ["full"] }
 
-# Passing arguments to the docsrs builder in order to properly document cfg's. 
+# Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
@@ -18,7 +18,7 @@ futures = "0.3.1"
 futures-timer = "3.0"
 instant = "0.1.11"
 libp2p-core = { version = "0.38.0", path = "../../core" }
-libp2p-swarm = { version = "0.41.0", path = "../../swarm" }
+libp2p-swarm = { version = "0.42.0", path = "../../swarm" }
 log = "0.4"
 prost-codec = { version = "0.3", path = "../../misc/prost-codec" }
 prost = "0.11"
@@ -34,7 +34,7 @@ libp2p = { path = "../..", features = ["full"] }
 rand = "0.8"
 clap = { version = "4.0.13", features = ["derive"] }
 
-# Passing arguments to the docsrs builder in order to properly document cfg's. 
+# Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml
@@ -15,7 +15,7 @@ cuckoofilter = "0.5.0"
 fnv = "1.0"
 futures = "0.3.1"
 libp2p-core = { version = "0.38.0", path = "../../core" }
-libp2p-swarm = { version = "0.41.0", path = "../../swarm" }
+libp2p-swarm = { version = "0.42.0", path = "../../swarm" }
 log = "0.4"
 prost = "0.11"
 rand = "0.8"
@@ -25,7 +25,7 @@ thiserror = "1.0.37"
 [build-dependencies]
 prost-build = "0.11"
 
-# Passing arguments to the docsrs builder in order to properly document cfg's. 
+# Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-libp2p-swarm = { version = "0.41.0", path = "../../swarm" }
+libp2p-swarm = { version = "0.42.0", path = "../../swarm" }
 libp2p-core = { version = "0.38.0", path = "../../core" }
 bytes = "1.0"
 byteorder = "1.3.4"
@@ -46,7 +46,7 @@ derive_builder = "0.11.1"
 [build-dependencies]
 prost-build = "0.11"
 
-# Passing arguments to the docsrs builder in order to properly document cfg's. 
+# Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
diff --git a/protocols/gossipsub/src/lib.rs b/protocols/gossipsub/src/lib.rs
@@ -121,8 +121,8 @@
 //!         libp2p_gossipsub::Gossipsub::new(message_authenticity, gossipsub_config).unwrap();
 //!     // subscribe to the topic
 //!     gossipsub.subscribe(&topic);
-//!     // create the swarm
-//!     libp2p_swarm::Swarm::new(
+//!     // create the swarm (use an executor in a real example)
+//!     libp2p_swarm::Swarm::without_executor(
 //!         transport,
 //!         gossipsub,
 //!         local_peer_id,
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
@@ -15,7 +15,7 @@ asynchronous-codec = "0.6"
 futures = "0.3.1"
 futures-timer = "3.0.2"
 libp2p-core = { version = "0.38.0", path = "../../core" }
-libp2p-swarm = { version = "0.41.0", path = "../../swarm" }
+libp2p-swarm = { version = "0.42.0", path = "../../swarm" }
 log = "0.4.1"
 lru = "0.8.0"
 prost-codec = { version = "0.3", path = "../../misc/prost-codec" }
@@ -32,7 +32,7 @@ libp2p = { path = "../..", features = ["full"] }
 [build-dependencies]
 prost-build = "0.11"
 
-# Passing arguments to the docsrs builder in order to properly document cfg's. 
+# Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
@@ -19,7 +19,7 @@ asynchronous-codec = "0.6"
 futures = "0.3.1"
 log = "0.4"
 libp2p-core = { version = "0.38.0", path = "../../core" }
-libp2p-swarm = { version = "0.41.0", path = "../../swarm" }
+libp2p-swarm = { version = "0.42.0", path = "../../swarm" }
 prost = "0.11"
 rand = "0.8"
 sha2 = "0.10.0"
@@ -44,7 +44,7 @@ prost-build = "0.11"
 [features]
 serde = ["dep:serde", "bytes/serde"]
 
-# Passing arguments to the docsrs builder in order to properly document cfg's. 
+# Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
@@ -16,7 +16,7 @@ data-encoding = "2.3.2"
 futures = "0.3.13"
 if-watch = "3.0.0"
 libp2p-core = { version = "0.38.0", path = "../../core" }
-libp2p-swarm = { version = "0.41.0", path = "../../swarm" }
+libp2p-swarm = { version = "0.42.0", path = "../../swarm" }
 log = "0.4.14"
 rand = "0.8.3"
 smallvec = "1.6.1"
@@ -45,7 +45,7 @@ name = "use-tokio"
 required-features = ["tokio"]
 
 
-# Passing arguments to the docsrs builder in order to properly document cfg's. 
+# Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml
@@ -15,7 +15,7 @@ futures = "0.3.1"
 futures-timer = "3.0.2"
 instant = "0.1.11"
 libp2p-core = { version = "0.38.0", path = "../../core" }
-libp2p-swarm = { version = "0.41.0", path = "../../swarm" }
+libp2p-swarm = { version = "0.42.0", path = "../../swarm" }
 log = "0.4.1"
 rand = "0.8"
 void = "1.0"
@@ -25,7 +25,7 @@ async-std = "1.6.2"
 libp2p = { path = "../..", features = ["full"] }
 quickcheck = { package = "quickcheck-ext", path = "../../misc/quickcheck-ext" }
 
-# Passing arguments to the docsrs builder in order to properly document cfg's. 
+# Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml
@@ -18,7 +18,7 @@ futures = "0.3.1"
 futures-timer = "3"
 instant = "0.1.11"
 libp2p-core = { version = "0.38.0", path = "../../core" }
-libp2p-swarm = { version = "0.41.0", path = "../../swarm" }
+libp2p-swarm = { version = "0.42.0", path = "../../swarm" }
 log = "0.4"
 pin-project = "1"
 prost-codec = { version = "0.3", path = "../../misc/prost-codec" }
@@ -38,7 +38,7 @@ libp2p = { path = "../..", features = ["full"] }
 quickcheck = { package = "quickcheck-ext", path = "../../misc/quickcheck-ext" }
 clap = { version = "4.0.13", features = ["derive"] }
 
-# Passing arguments to the docsrs builder in order to properly document cfg's. 
+# Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml
@@ -17,7 +17,7 @@ futures = { version = "0.3", default-features = false, features = ["std"] }
 futures-timer = "3.0.2"
 instant = "0.1.11"
 libp2p-core = { version = "0.38.0", path = "../../core" }
-libp2p-swarm = { version = "0.41.0", path = "../../swarm" }
+libp2p-swarm = { version = "0.42.0", path = "../../swarm" }
 log = "0.4"
 prost = "0.11"
 prost-codec = { version = "0.3.0", path = "../../misc/prost-codec" }
@@ -37,7 +37,7 @@ tokio = { version = "1.15", features = [ "rt-multi-thread", "time", "macros", "s
 [build-dependencies]
 prost-build = "0.11"
 
-# Passing arguments to the docsrs builder in order to properly document cfg's. 
+# Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
@@ -16,7 +16,7 @@ bytes = "1"
 futures = "0.3.1"
 instant = "0.1.11"
 libp2p-core = { version = "0.38.0", path = "../../core" }
-libp2p-swarm = { version = "0.41.0", path = "../../swarm" }
+libp2p-swarm = { version = "0.42.0", path = "../../swarm" }
 log = "0.4.11"
 rand = "0.8"
 smallvec = "1.6.1"
@@ -28,7 +28,7 @@ env_logger = "0.10.0"
 libp2p = { path = "../..", features = ["full"] }
 rand = "0.8"
 
-# Passing arguments to the docsrs builder in order to properly document cfg's. 
+# Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
diff --git a/src/lib.rs b/src/lib.rs
@@ -140,7 +140,6 @@ pub use libp2p_yamux as yamux;
 mod transport_ext;
 
 pub mod bandwidth;
-pub mod simple;
 
 #[cfg(doc)]
 pub mod tutorials;
@@ -152,7 +151,6 @@ pub use self::core::{
     PeerId, Transport,
 };
 pub use self::multiaddr::{multiaddr as build_multiaddr, Multiaddr};
-pub use self::simple::SimpleProtocol;
 pub use self::swarm::Swarm;
 pub use self::transport_ext::TransportExt;
 
diff --git a/src/simple.rs b/src/simple.rs
diff --git a/src/tutorials/ping.rs b/src/tutorials/ping.rs
diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
diff --git a/swarm/src/behaviour.rs b/swarm/src/behaviour.rs
diff --git a/swarm/src/connection/pool.rs b/swarm/src/connection/pool.rs
diff --git a/swarm/src/executor.rs b/swarm/src/executor.rs
diff --git a/swarm/src/lib.rs b/swarm/src/lib.rs
