Replace builders with common_objects_factory in wsv_query (#1573)

Signed-off-by: Nikita Alekseev <[email protected]>
hyperledger-iroha · Jul 25, 2018 · 68fae26 · 68fae26
1 parent 82981e5
commit 68fae26
Show file tree

Hide file tree

Showing 24 changed files with 210 additions and 232 deletions.
diff --git a/irohad/ametsuchi/CMakeLists.txt b/irohad/ametsuchi/CMakeLists.txt
@@ -25,3 +25,7 @@ target_link_libraries(ametsuchi
     SOCI::core
     SOCI::postgresql
     )
+
+target_compile_definitions(ametsuchi
+    PRIVATE SOCI_USE_BOOST HAVE_BOOST
+    )
diff --git a/irohad/ametsuchi/impl/mutable_storage_impl.cpp b/irohad/ametsuchi/impl/mutable_storage_impl.cpp
@@ -23,16 +23,18 @@
 #include "ametsuchi/impl/postgres_wsv_command.hpp"
 #include "ametsuchi/impl/postgres_wsv_query.hpp"
 #include "ametsuchi/wsv_command.hpp"
+#include "interfaces/common_objects/common_objects_factory.hpp"
 #include "model/sha3_hash.hpp"
 
 namespace iroha {
   namespace ametsuchi {
     MutableStorageImpl::MutableStorageImpl(
         shared_model::interface::types::HashType top_hash,
-        std::unique_ptr<soci::session> sql)
+        std::unique_ptr<soci::session> sql,
+        std::shared_ptr<shared_model::interface::CommonObjectsFactory> factory)
         : top_hash_(top_hash),
           sql_(std::move(sql)),
-          wsv_(std::make_shared<PostgresWsvQuery>(*sql_)),
+          wsv_(std::make_shared<PostgresWsvQuery>(*sql_, factory)),
           executor_(std::make_shared<PostgresWsvCommand>(*sql_)),
           block_index_(std::make_unique<PostgresBlockIndex>(*sql_)),
           command_executor_(std::make_shared<CommandExecutor>(wsv_, executor_)),

diff --git a/irohad/ametsuchi/impl/mutable_storage_impl.hpp b/irohad/ametsuchi/impl/mutable_storage_impl.hpp
@@ -23,6 +23,7 @@
 
 #include "ametsuchi/mutable_storage.hpp"
 #include "execution/command_executor.hpp"
+#include "interfaces/common_objects/common_objects_factory.hpp"
 #include "logger/logger.hpp"
 
 namespace iroha {
@@ -37,7 +38,9 @@ namespace iroha {
 
      public:
       MutableStorageImpl(shared_model::interface::types::HashType top_hash,
-                         std::unique_ptr<soci::session> sql);
+                         std::unique_ptr<soci::session> sql,
+                         std::shared_ptr<shared_model::interface::CommonObjectsFactory>
+                         factory);
 
       bool apply(
           const shared_model::interface::Block &block,

diff --git a/irohad/ametsuchi/impl/postgres_block_index.hpp b/irohad/ametsuchi/impl/postgres_block_index.hpp
@@ -21,7 +21,7 @@
 #include <boost/format.hpp>
 
 #include "ametsuchi/impl/block_index.hpp"
-#include "ametsuchi/impl/postgres_wsv_common.hpp"
+#include "ametsuchi/impl/soci_utils.hpp"
 #include "interfaces/transaction.hpp"
 #include "logger/logger.hpp"
 

diff --git a/irohad/ametsuchi/impl/postgres_block_query.hpp b/irohad/ametsuchi/impl/postgres_block_query.hpp
@@ -23,7 +23,7 @@
 #include "ametsuchi/block_query.hpp"
 #include "ametsuchi/impl/flat_file/flat_file.hpp"
 #include "logger/logger.hpp"
-#include "postgres_wsv_common.hpp"
+#include "ametsuchi/impl/soci_utils.hpp"
 
 namespace iroha {
   namespace ametsuchi {

diff --git a/irohad/ametsuchi/impl/postgres_ordering_service_persistent_state.hpp b/irohad/ametsuchi/impl/postgres_ordering_service_persistent_state.hpp
@@ -18,7 +18,7 @@
 #ifndef IROHA_POSTGRES_ORDERING_SERVICE_PERSISTENT_STATE_HPP
 #define IROHA_POSTGRES_ORDERING_SERVICE_PERSISTENT_STATE_HPP
 
-#include "ametsuchi/impl/postgres_wsv_common.hpp"
+#include "ametsuchi/impl/soci_utils.hpp"
 #include "ametsuchi/ordering_service_persistent_state.hpp"
 #include "common/result.hpp"
 #include "logger/logger.hpp"

diff --git a/irohad/ametsuchi/impl/postgres_wsv_command.cpp b/irohad/ametsuchi/impl/postgres_wsv_command.cpp
@@ -17,8 +17,16 @@
 
 #include "ametsuchi/impl/postgres_wsv_command.hpp"
 
+#include <numeric>
+
 #include <boost/format.hpp>
+
 #include "backend/protobuf/permissions.hpp"
+#include "interfaces/common_objects/account.hpp"
+#include "interfaces/common_objects/account_asset.hpp"
+#include "interfaces/common_objects/asset.hpp"
+#include "interfaces/common_objects/domain.hpp"
+#include "interfaces/common_objects/peer.hpp"
 
 namespace iroha {
   namespace ametsuchi {

diff --git a/irohad/ametsuchi/impl/postgres_wsv_command.hpp b/irohad/ametsuchi/impl/postgres_wsv_command.hpp
@@ -20,7 +20,7 @@
 
 #include "ametsuchi/wsv_command.hpp"
 
-#include "ametsuchi/impl/postgres_wsv_common.hpp"
+#include "ametsuchi/impl/soci_utils.hpp"
 
 namespace iroha {
   namespace ametsuchi {

diff --git a/irohad/ametsuchi/impl/postgres_wsv_common.hpp b/irohad/ametsuchi/impl/postgres_wsv_common.hpp