review: apply new round of review suggestions

libp2p · Sep 23, 2022 · d0468fb · d0468fb
1 parent c1ec17e
commit d0468fb
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -69,6 +69,8 @@
 
 - Update to [`libp2p-swarm` `v0.39.1`](swarm/CHANGELOG.md#0391).
 
+- Update to [`libp2p-identify` `v0.39.1`](protocols/identify/CHANGELOG.md#0391).
+
 # 0.48.0
 
 - Update to [`libp2p-core` `v0.36.0`](core/CHANGELOG.md#0360).

diff --git a/Cargo.toml b/Cargo.toml
@@ -84,7 +84,7 @@ libp2p-autonat = { version = "0.7.0", path = "protocols/autonat", optional = tru
 libp2p-core = { version = "0.36.1", path = "core",  default-features = false }
 libp2p-dcutr = { version = "0.6.0", path = "protocols/dcutr",  optional = true }
 libp2p-floodsub = { version = "0.39.1", path = "protocols/floodsub", optional = true }
-libp2p-identify = { version = "0.40.0", path = "protocols/identify", optional = true }
+libp2p-identify = { version = "0.39.1", path = "protocols/identify", optional = true }
 libp2p-kad = { version = "0.41.0", path = "protocols/kad", optional = true }
 libp2p-metrics = { version = "0.10.0", path = "misc/metrics", optional = true }
 libp2p-mplex = { version = "0.36.1", path = "muxers/mplex", optional = true }

diff --git a/misc/metrics/CHANGELOG.md b/misc/metrics/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 - Update to `libp2p-kad` `v0.41.0`.
 
+- Update to `libp2p-identify` `v0.39.1`.
+
 # 0.9.0
 
 - Update to `libp2p-swarm` `v0.39.0`.

diff --git a/misc/metrics/Cargo.toml b/misc/metrics/Cargo.toml
@@ -21,7 +21,7 @@ dcutr = ["libp2p-dcutr"]
 [dependencies]
 libp2p-core = { version = "0.36.0", path = "../../core", default-features = false }
 libp2p-dcutr =  { version = "0.6.0", path = "../../protocols/dcutr", optional = true }
-libp2p-identify = { version = "0.40.0", path = "../../protocols/identify", optional = true }
+libp2p-identify = { version = "0.39.1", path = "../../protocols/identify", optional = true }
 libp2p-kad = { version = "0.41.0", path = "../../protocols/kad", optional = true }
 libp2p-ping = { version = "0.39.0", path = "../../protocols/ping", optional = true }
 libp2p-relay =  { version = "0.12.0", path = "../../protocols/relay", optional = true }

diff --git a/protocols/identify/CHANGELOG.md b/protocols/identify/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 0.40.0 [unreleased]
+# 0.39.1 [unreleased]
 
 - Rename types as per [discussion 2174].
   `Identify` has been renamed to `Behaviour`.

diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-identify"
 edition = "2021"
 rust-version = "1.56.1"
 description = "Nodes identifcation protocol for libp2p"
-version = "0.39.0"
+version = "0.39.1"
 authors = ["Parity Technologies <[email protected]>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"

diff --git a/protocols/identify/src/lib.rs b/protocols/identify/src/lib.rs
@@ -21,7 +21,7 @@
 //! Implementation of the [Identify] protocol.
 //!
 //! This implementation of the protocol periodically exchanges
-//! [`IdentifyInfo`] messages between the peers on an established connection.
+//! [`identify::Info`] messages between the peers on an established connection.
 //!
 //! At least one identification request is sent on a newly established
 //! connection, beyond which the behaviour does not keep connections alive.
@@ -62,6 +62,12 @@ pub type IdentifyEvent = Event;
 #[deprecated(since = "0.40.0", note = "Use libp2p::identify::Behaviour instead.")]
 pub type Identify = Behaviour;
 
+#[deprecated(
+    since = "0.40.0",
+    note = "Use re-exports that omit `Identify` prefix, i.e. `libp2p::identify::Info`"
+)]
+pub type IdentifyInfo = Info;
+
 mod behaviour;
 mod handler;
 mod protocol;

diff --git a/swarm-derive/tests/test.rs b/swarm-derive/tests/test.rs
@@ -314,7 +314,7 @@ fn custom_event_with_either() {
     }
 
     impl From<Either<libp2p::ping::PingEvent, libp2p::identify::Event>> for BehaviourOutEvent {
-        fn from(event: Either<libp2p::ping::PingEvent, libp2p::identify::IdentifyEvent>) -> Self {
+        fn from(event: Either<libp2p::ping::PingEvent, libp2p::identify::Event>) -> Self {
             BehaviourOutEvent::PingOrIdentify(event)
         }
     }