StreamProtocols are passed to Identify (#268)

* StreamProtocols are passed to Identify

* Revert "StreamProtocols are passed to Identify"

This reverts commit af9cc1a.

* Config for Identify

Author: ErakhtinB

include/libp2p/protocol/identify/config.hpp

@@ -0,0 +1,22 @@
+/**
+ * Copyright Quadrivium LLC
+ * All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include <libp2p/peer/stream_protocols.hpp>
+
+namespace {
+  const std::string kIdentifyProto = "/ipfs/id/1.0.0";
+}  // namespace
+
+namespace libp2p::protocol {
+
+  struct IdentifyConfig {
+    IdentifyConfig() = default;
+    StreamProtocols protocols = {::kIdentifyProto};
+  };
+
+}  // namespace libp2p::protocol

include/libp2p/protocol/identify/identify.hpp

@@ -11,6 +11,7 @@
 
 #include <libp2p/event/bus.hpp>
 #include <libp2p/protocol/base_protocol.hpp>
+#include <libp2p/protocol/identify/config.hpp>
 #include <libp2p/protocol/identify/identify_msg_processor.hpp>
 
 namespace libp2p::multi {
@@ -32,7 +33,8 @@ namespace libp2p::protocol {
      * @param msg_processor to work with Identify messages
      * @param event_bus - bus, over which the events arrive
      */
-    Identify(Host &host,
+    Identify(const IdentifyConfig &config,
+             Host &host,
              std::shared_ptr<IdentifyMessageProcessor> msg_processor,
              event::Bus &event_bus);
 
@@ -81,7 +83,7 @@ namespace libp2p::protocol {
     std::shared_ptr<IdentifyMessageProcessor> msg_processor_;
     event::Bus &bus_;
     event::Handle sub_;  // will unsubscribe during destruction by itself
-
+    StreamProtocols protocols_;
     bool started_ = false;
   };
 }  // namespace libp2p::protocol

src/protocol/identify/identify.cpp

@@ -5,21 +5,20 @@
  */
 
 #include <libp2p/protocol/identify/identify.hpp>
-
 #include <string>
 #include <tuple>
 
 #include <boost/assert.hpp>
 
-namespace {
-  const std::string kIdentifyProto = "/ipfs/id/1.0.0";
-}  // namespace
-
 namespace libp2p::protocol {
-  Identify::Identify(Host &host,
+  Identify::Identify(const IdentifyConfig &config,
+                     Host &host,
                      std::shared_ptr<IdentifyMessageProcessor> msg_processor,
                      event::Bus &event_bus)
-      : host_{host}, msg_processor_{std::move(msg_processor)}, bus_{event_bus} {
+      : host_{host},
+        msg_processor_{std::move(msg_processor)},
+        bus_{event_bus},
+        protocols_{config.protocols} {
     BOOST_ASSERT(msg_processor_);
   }
 
@@ -38,7 +37,7 @@ namespace libp2p::protocol {
   }
 
   peer::ProtocolName Identify::getProtocolId() const {
-    return kIdentifyProto;
+    return protocols_.empty() ? peer::ProtocolName{} : protocols_.front();
   }
 
   void Identify::handle(StreamAndProtocol stream) {
@@ -50,7 +49,7 @@ namespace libp2p::protocol {
     BOOST_ASSERT(!started_);
     started_ = true;
 
-    host_.setProtocolHandler({kIdentifyProto},
+    host_.setProtocolHandler(protocols_,
                              [wp = weak_from_this()](StreamAndProtocol stream) {
                                if (auto self = wp.lock()) {
                                  self->handle(std::move(stream));
@@ -86,9 +85,7 @@ namespace libp2p::protocol {
                                  std::move(remote_peer_addr_res.value())}};
 
     msg_processor_->getHost().newStream(
-        peer_info,
-        {kIdentifyProto},
-        [self{shared_from_this()}](auto &&stream_res) {
+        peer_info, protocols_, [self{shared_from_this()}](auto &&stream_res) {
           if (!stream_res) {
             return;
           }

test/libp2p/protocol/identify_test.cpp

@@ -80,7 +80,9 @@ class IdentifyTest : public testing::Test {
 
     id_msg_processor_ = std::make_shared<IdentifyMessageProcessor>(
         host_, conn_manager_, id_manager_, key_marshaller_);
-    identify_ = std::make_shared<Identify>(host_, id_msg_processor_, bus_);
+    IdentifyConfig config;
+    config.protocols = {kIdentifyProto};
+    identify_ = std::make_shared<Identify>(config, host_, id_msg_processor_, bus_);
   }
 
   HostMock host_;