Unity build: prepare support in irohad

Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
hyperledger-iroha · Aug 29, 2019 · 7096c5d · 7096c5d
1 parent 97ec9cf
commit 7096c5d
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 70 deletions.
diff --git a/irohad/ametsuchi/CMakeLists.txt b/irohad/ametsuchi/CMakeLists.txt
@@ -74,6 +74,7 @@ add_library(ametsuchi
     impl/postgres_wsv_command.cpp
     impl/peer_query_wsv.cpp
     impl/postgres_block_query.cpp
+    impl/executor_common.cpp
     impl/postgres_command_executor.cpp
     impl/postgres_indexer.cpp
     impl/postgres_block_index.cpp

diff --git a/irohad/ametsuchi/impl/executor_common.cpp b/irohad/ametsuchi/impl/executor_common.cpp
@@ -0,0 +1,29 @@
+/**
+ * Copyright Soramitsu Co., Ltd. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "ametsuchi/impl/executor_common.hpp"
+
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include "interfaces/permissions.hpp"
+
+namespace iroha {
+  namespace ametsuchi {
+
+    const std::string kRootRolePermStr{
+        shared_model::interface::RolePermissionSet(
+            {shared_model::interface::permissions::Role::kRoot})
+            .toBitstring()};
+
+    shared_model::interface::types::DomainIdType getDomainFromName(
+        const shared_model::interface::types::AccountIdType &account_id) {
+      // TODO 03.10.18 andrei: IR-1728 Move getDomainFromName to shared_model
+      std::vector<std::string> res;
+      boost::split(res, account_id, boost::is_any_of("@"));
+      return res.at(1);
+    }
+
+  }  // namespace ametsuchi
+}  // namespace iroha
diff --git a/irohad/ametsuchi/impl/executor_common.hpp b/irohad/ametsuchi/impl/executor_common.hpp
@@ -0,0 +1,22 @@
+/**
+ * Copyright Soramitsu Co., Ltd. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef IROHA_AMETSUCHI_EXECUTOR_COMMON_HPP
+#define IROHA_AMETSUCHI_EXECUTOR_COMMON_HPP
+
+#include "interfaces/common_objects/types.hpp"
+
+namespace iroha {
+  namespace ametsuchi {
+
+    extern const std::string kRootRolePermStr;
+
+    shared_model::interface::types::DomainIdType getDomainFromName(
+        const shared_model::interface::types::AccountIdType &account_id);
+
+  }  // namespace ametsuchi
+}  // namespace iroha
+
+#endif  // IROHA_AMETSUCHI_EXECUTOR_COMMON_HPP
diff --git a/irohad/ametsuchi/impl/postgres_command_executor.cpp b/irohad/ametsuchi/impl/postgres_command_executor.cpp
@@ -50,9 +50,6 @@ namespace {
   const std::string kPgTrue{"true"};
   const std::string kPgFalse{"false"};
 
-  const auto kRootRolePermStr =
-      shared_model::interface::RolePermissionSet({Role::kRoot}).toBitstring();
-
   std::string makeJsonString(std::string value) {
     return std::string{"\""} + value + "\"";
   }
@@ -187,7 +184,7 @@ namespace {
               JOIN account_has_roles AS ar on ar.role_id = rp.role_id
               WHERE ar.account_id = %4%)")
                          % kRolePermissionSetSize % permission_bitstring
-                         % kRootRolePermStr % account_id)
+                         % iroha::ametsuchi::kRootRolePermStr % account_id)
                             .str();
     return query;
   }
@@ -223,14 +220,6 @@ namespace {
     return query;
   }
 
-  shared_model::interface::types::DomainIdType getDomainFromName(
-      const shared_model::interface::types::AccountIdType &account_id) {
-    // TODO 03.10.18 andrei: IR-1728 Move getDomainFromName to shared_model
-    std::vector<std::string> res;
-    boost::split(res, account_id, boost::is_any_of("@"));
-    return res.at(1);
-  }
-
   /**
    * Generate an SQL subquery which checks if creator has corresponding
    * permissions for target account

diff --git a/irohad/ametsuchi/impl/postgres_specific_query_executor.cpp b/irohad/ametsuchi/impl/postgres_specific_query_executor.cpp
@@ -5,14 +5,13 @@
 
 #include "ametsuchi/impl/postgres_specific_query_executor.hpp"
 
-#include <boost/algorithm/string/classification.hpp>
-#include <boost/algorithm/string/split.hpp>
 #include <boost/format.hpp>
 #include <boost/range/adaptor/filtered.hpp>
 #include <boost/range/adaptor/transformed.hpp>
 #include <boost/range/algorithm/transform.hpp>
 #include <boost/range/irange.hpp>
 #include "ametsuchi/block_storage.hpp"
+#include "ametsuchi/impl/executor_common.hpp"
 #include "ametsuchi/impl/soci_utils.hpp"
 #include "backend/plain/account_detail_record_id.hpp"
 #include "backend/plain/peer.hpp"
@@ -47,25 +46,15 @@ namespace {
 
   using namespace iroha;
 
-  const auto kRootRolePermStr =
-      shared_model::interface::RolePermissionSet({Role::kRoot}).toBitstring();
-
-  shared_model::interface::types::DomainIdType getDomainFromName(
-      const shared_model::interface::types::AccountIdType &account_id) {
-    // TODO 03.10.18 andrei: IR-1728 Move getDomainFromName to shared_model
-    std::vector<std::string> res;
-    boost::split(res, account_id, boost::is_any_of("@"));
-    return res.at(1);
-  }
-
   std::string getAccountRolePermissionCheckSql(
       shared_model::interface::permissions::Role permission,
       const std::string &account_alias = ":role_account_id") {
     const auto perm_str =
         shared_model::interface::RolePermissionSet({permission}).toBitstring();
     const auto bits = shared_model::interface::RolePermissionSet::size();
     // TODO 14.09.18 andrei: IR-1708 Load SQL from separate files
-    std::string query = (boost::format(R"(
+    std::string query =
+        (boost::format(R"(
           SELECT
             (
               COALESCE(bit_or(rp.permission), '0'::bit(%1%))
@@ -75,8 +64,8 @@ namespace {
           FROM role_has_permissions AS rp
           JOIN account_has_roles AS ar on ar.role_id = rp.role_id
           WHERE ar.account_id = %4%)")
-                         % bits % perm_str % kRootRolePermStr % account_alias)
-                            .str();
+         % bits % perm_str % iroha::ametsuchi::kRootRolePermStr % account_alias)
+            .str();
     return query;
   }
 

diff --git a/irohad/multi_sig_transactions/transport/impl/mst_transport_grpc.cpp b/irohad/multi_sig_transactions/transport/impl/mst_transport_grpc.cpp
@@ -59,27 +59,19 @@ MstTransportGrpc::MstTransportGrpc(
 
 shared_model::interface::types::SharedTxsCollectionType
 MstTransportGrpc::deserializeTransactions(const transport::MstState *request) {
-  return boost::copy_range<
-      shared_model::interface::types::SharedTxsCollectionType>(
-      request->transactions()
-      | boost::adaptors::transformed(
-            [&](const auto &tx) { return transaction_factory_->build(tx); })
-      | boost::adaptors::filtered([&](const auto &result) {
-          return result.match(
-              [](const auto &) { return true; },
-              [&](const auto &error) {
-                log_->info("Transaction deserialization failed: hash {}, {}",
-                           error.error.hash,
-                           error.error.error);
-                return false;
-              });
-        })
-      | boost::adaptors::transformed([&](auto result) {
-          return std::move(
-                     boost::get<iroha::expected::ValueOf<decltype(result)>>(
-                         result))
-              .value;
-        }));
+  shared_model::interface::types::SharedTxsCollectionType tx_collection;
+  for (const auto &tx : request->transactions()) {
+    transaction_factory_->build(tx).match(
+        [&tx_collection](auto &&v) {
+          tx_collection.emplace_back(std::move(v).value);
+        },
+        [this](const auto &error) {
+          log_->info("Transaction deserialization failed: hash {}, {}",
+                     error.error.hash,
+                     error.error.error);
+        });
+  }
+  return tx_collection;
 }
 
 grpc::Status MstTransportGrpc::SendState(

diff --git a/irohad/ordering/impl/on_demand_os_server_grpc.cpp b/irohad/ordering/impl/on_demand_os_server_grpc.cpp
@@ -34,27 +34,19 @@ OnDemandOsServerGrpc::OnDemandOsServerGrpc(
 shared_model::interface::types::SharedTxsCollectionType
 OnDemandOsServerGrpc::deserializeTransactions(
     const proto::BatchesRequest *request) {
-  return boost::copy_range<
-      shared_model::interface::types::SharedTxsCollectionType>(
-      request->transactions()
-      | boost::adaptors::transformed(
-            [&](const auto &tx) { return transaction_factory_->build(tx); })
-      | boost::adaptors::filtered([&](const auto &result) {
-          return result.match(
-              [](const auto &) { return true; },
-              [&](const auto &error) {
-                log_->info("Transaction deserialization failed: hash {}, {}",
-                           error.error.hash,
-                           error.error.error);
-                return false;
-              });
-        })
-      | boost::adaptors::transformed([](auto result) {
-          return std::move(
-                     boost::get<iroha::expected::ValueOf<decltype(result)>>(
-                         result))
-              .value;
-        }));
+  shared_model::interface::types::SharedTxsCollectionType tx_collection;
+  for (const auto &tx : request->transactions()) {
+    transaction_factory_->build(tx).match(
+        [&tx_collection](auto &&v) {
+          tx_collection.emplace_back(std::move(v).value);
+        },
+        [this](const auto &error) {
+          log_->info("Transaction deserialization failed: hash {}, {}",
+                     error.error.hash,
+                     error.error.error);
+        });
+  }
+  return tx_collection;
 }
 
 grpc::Status OnDemandOsServerGrpc::SendBatches(