wsv peer query: added peers query by key

Signed-off-by: Mikhail Boldyrev <miboldyrev@gmail.com>
hyperledger · Oct 3, 2019 · 0a7be00 · 0a7be00
1 parent 6055bdf
commit 0a7be00
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 12 deletions.
diff --git a/irohad/ametsuchi/impl/peer_query_wsv.cpp b/irohad/ametsuchi/impl/peer_query_wsv.cpp
@@ -20,5 +20,10 @@ namespace iroha {
       return wsv_->getPeers();
     }
 
+    boost::optional<PeerQuery::wPeer> PeerQueryWsv::getLedgerPeerByPublicKey(
+        const shared_model::interface::types::PubkeyType &public_key) const {
+      return wsv_->getPeerByPublicKey(public_key);
+    }
+
   }  // namespace ametsuchi
 }  // namespace iroha
diff --git a/irohad/ametsuchi/impl/peer_query_wsv.hpp b/irohad/ametsuchi/impl/peer_query_wsv.hpp
@@ -11,6 +11,8 @@
 #include <memory>
 #include <vector>
 
+#include "interfaces/common_objects/types.hpp"
+
 namespace iroha {
   namespace ametsuchi {
 
@@ -29,6 +31,14 @@ namespace iroha {
        */
       boost::optional<std::vector<wPeer>> getLedgerPeers() override;
 
+      /**
+       * Fetch peer with given public key from ledger
+       * @return the peer if found, none otherwise
+       */
+      boost::optional<PeerQuery::wPeer> getLedgerPeerByPublicKey(
+          const shared_model::interface::types::PubkeyType &public_key)
+          const override;
+
      private:
       std::shared_ptr<WsvQuery> wsv_;
     };

diff --git a/irohad/ametsuchi/impl/postgres_wsv_query.cpp b/irohad/ametsuchi/impl/postgres_wsv_query.cpp
@@ -12,6 +12,22 @@
 #include "cryptography/public_key.hpp"
 #include "logger/logger.hpp"
 
+namespace {
+  template <typename T>
+  boost::optional<std::vector<std::shared_ptr<shared_model::interface::Peer>>>
+  getPeersFromSociRowSet(T &&rowset) {
+    return iroha::ametsuchi::flatMapValues<
+        std::vector<std::shared_ptr<shared_model::interface::Peer>>>(
+        std::forward<T>(rowset), [&](auto &public_key, auto &address) {
+          return boost::make_optional(
+              std::make_shared<shared_model::plain::Peer>(
+                  address,
+                  shared_model::crypto::PublicKey{
+                      shared_model::crypto::Blob::fromHexString(public_key)}));
+        });
+  }
+}  // namespace
+
 namespace iroha {
   namespace ametsuchi {
 
@@ -60,16 +76,23 @@ namespace iroha {
         return (sql_.prepare << "SELECT public_key, address FROM peer");
       });
 
-      return flatMapValues<
-          std::vector<std::shared_ptr<shared_model::interface::Peer>>>(
-          result, [&](auto &public_key, auto &address) {
-            return boost::make_optional(
-                std::make_shared<shared_model::plain::Peer>(
-                    address,
-                    shared_model::crypto::PublicKey{
-                        shared_model::crypto::Blob::fromHexString(
-                            public_key)}));
-          });
+      return getPeersFromSociRowSet(result);
+    }
+
+    boost::optional<std::shared_ptr<shared_model::interface::Peer>>
+    PostgresWsvQuery::getPeerByPublicKey(const PubkeyType &public_key) {
+      using T = boost::tuple<std::string, AddressType>;
+      auto result = execute<T>([&] {
+        return (sql_.prepare << R"(
+            SELECT public_key, address
+            FROM peer
+            WHERE public_key = :public_key)",
+                soci::use(public_key.hex(), "public_key"));
+      });
+
+      return getPeersFromSociRowSet(result) | [](auto &&peers) {
+        return boost::make_optional(std::move(peers.front()));
+      };
     }
   }  // namespace ametsuchi
 }  // namespace iroha
diff --git a/irohad/ametsuchi/impl/postgres_wsv_query.hpp b/irohad/ametsuchi/impl/postgres_wsv_query.hpp
@@ -28,6 +28,10 @@ namespace iroha {
           std::vector<std::shared_ptr<shared_model::interface::Peer>>>
       getPeers() override;
 
+      boost::optional<std::shared_ptr<shared_model::interface::Peer>>
+      getPeerByPublicKey(const shared_model::interface::types::PubkeyType
+                             &public_key) override;
+
      private:
       /**
        * Executes given lambda of type F, catches exceptions if any, logs the

diff --git a/irohad/ametsuchi/peer_query.hpp b/irohad/ametsuchi/peer_query.hpp
@@ -9,6 +9,7 @@
 #include <boost/optional.hpp>
 #include <memory>
 #include <vector>
+#include "interfaces/common_objects/types.hpp"
 
 namespace shared_model {
   namespace interface {
@@ -35,6 +36,14 @@ namespace iroha {
        */
       virtual boost::optional<std::vector<wPeer>> getLedgerPeers() = 0;
 
+      /**
+       * Fetch peer with given public key from ledger
+       * @return the peer if found, none otherwise
+       */
+      virtual boost::optional<PeerQuery::wPeer> getLedgerPeerByPublicKey(
+          const shared_model::interface::types::PubkeyType &public_key)
+          const = 0;
+
       virtual ~PeerQuery() = default;
     };
 

diff --git a/irohad/ametsuchi/wsv_query.hpp b/irohad/ametsuchi/wsv_query.hpp
@@ -31,12 +31,20 @@ namespace iroha {
           const shared_model::interface::types::AccountIdType &account_id) = 0;
 
       /**
-       *
-       * @return
+       * Fetch peers stored in ledger
+       * @return list of peers in insertion to ledger order
        */
       virtual boost::optional<
           std::vector<std::shared_ptr<shared_model::interface::Peer>>>
       getPeers() = 0;
+
+      /**
+       * Fetch peer with given public key from ledger
+       * @return the peer if found, none otherwise
+       */
+      virtual boost::optional<std::shared_ptr<shared_model::interface::Peer>>
+      getPeerByPublicKey(
+          const shared_model::interface::types::PubkeyType &public_key) = 0;
     };
 
   }  // namespace ametsuchi

diff --git a/test/module/irohad/ametsuchi/mock_peer_query.hpp b/test/module/irohad/ametsuchi/mock_peer_query.hpp
@@ -18,6 +18,11 @@ namespace iroha {
       MockPeerQuery() = default;
 
       MOCK_METHOD0(getLedgerPeers, boost::optional<std::vector<wPeer>>());
+
+      MOCK_CONST_METHOD1(
+          getLedgerPeerByPublicKey,
+          boost::optional<PeerQuery::wPeer>(
+              const shared_model::interface::types::PubkeyType &));
     };
 
   }  // namespace ametsuchi

diff --git a/test/module/irohad/ametsuchi/mock_wsv_query.hpp b/test/module/irohad/ametsuchi/mock_wsv_query.hpp
@@ -23,6 +23,11 @@ namespace iroha {
           getPeers,
           boost::optional<
               std::vector<std::shared_ptr<shared_model::interface::Peer>>>());
+
+      MOCK_METHOD1(
+          getPeerByPublicKey,
+          boost::optional<std::shared_ptr<shared_model::interface::Peer>>(
+              const shared_model::interface::types::PubkeyType &public_key));
     };
 
   }  // namespace ametsuchi