merge from develop

Signed-off-by: Victor Drobny <[email protected]>
itorK · Feb 5, 2018 · 6faab84 · 6faab84
1 parent bf62797
commit 6faab84
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 9 deletions.
diff --git a/irohad/ametsuchi/block_query.hpp b/irohad/ametsuchi/block_query.hpp
@@ -43,7 +43,7 @@ namespace iroha {
        * @param account_id - account_id (accountName@domainName)
        * @return observable of Model Transaction
        */
-      virtual rxcpp::observable<model::Transaction> getAccountTransactions(
+      virtual rxcpp::observable<shared_model::Transaction> getAccountTransactions(
           const std::string &account_id) = 0;
 
       /**

diff --git a/irohad/ametsuchi/impl/mutable_storage_impl.hpp b/irohad/ametsuchi/impl/mutable_storage_impl.hpp
@@ -22,6 +22,8 @@
 #include <pqxx/nontransaction>
 #include <unordered_map>
 
+#include "ametsuchi/mutable_storage.hpp"
+#include "model/execution/command_executor_factory.hpp"
 #include "logger/logger.hpp"
 
 namespace iroha {

diff --git a/irohad/ametsuchi/impl/postgres_block_query.hpp b/irohad/ametsuchi/impl/postgres_block_query.hpp
@@ -27,7 +27,6 @@
 #include "model/converters/json_block_factory.hpp"
 
 #include <boost/optional.hpp>
-#include <cpp_redis/cpp_redis>
 
 #include "model/converters/json_block_factory.hpp"
 

diff --git a/irohad/ametsuchi/impl/postgres_wsv_common.hpp b/irohad/ametsuchi/impl/postgres_wsv_common.hpp
@@ -19,6 +19,7 @@
 #define IROHA_POSTGRES_WSV_COMMON_HPP
 
 #include <pqxx/nontransaction>
+#include <nonstd/optional.hpp>
 #include "logger/logger.hpp"
 
 namespace iroha {

diff --git a/irohad/ametsuchi/impl/storage_impl.cpp b/irohad/ametsuchi/impl/storage_impl.cpp
@@ -34,11 +34,9 @@ namespace iroha {
 
     ConnectionContext::ConnectionContext(
         std::unique_ptr<FlatFile> block_store,
-        std::unique_ptr<cpp_redis::client> index,
         std::unique_ptr<pqxx::lazyconnection> pg_lazy,
         std::unique_ptr<pqxx::nontransaction> pg_nontx)
         : block_store(std::move(block_store)),
-          index(std::move(index)),
           pg_lazy(std::move(pg_lazy)),
           pg_nontx(std::move(pg_nontx)) {}
 

diff --git a/irohad/ametsuchi/impl/storage_impl.hpp b/irohad/ametsuchi/impl/storage_impl.hpp
@@ -36,10 +36,6 @@ namespace iroha {
     struct ConnectionContext {
       ConnectionContext(std::unique_ptr<FlatFile> block_store,
                         std::unique_ptr<pqxx::lazyconnection> pg_lazy,
-                        std::unique_ptr<pqxx::nontransaction> pg_nontx)
-          : block_store(std::move(block_store)),
-            pg_lazy(std::move(pg_lazy)),
-            pg_nontx(std::move(pg_nontx)) {}
                         std::unique_ptr<pqxx::nontransaction> pg_nontx);
 
       std::unique_ptr<FlatFile> block_store;

diff --git a/test/module/irohad/ametsuchi/ametsuchi_test.cpp b/test/module/irohad/ametsuchi/ametsuchi_test.cpp
@@ -20,7 +20,7 @@
 #include <boost/range/combine.hpp>
 
 #include "ametsuchi/impl/postgres_wsv_query.hpp"
-#include "ametsuchi/impl/redis_block_query.hpp"
+#include "ametsuchi/impl/postgres_block_query.hpp"
 #include "ametsuchi/impl/storage_impl.hpp"
 #include "ametsuchi/mutable_storage.hpp"
 #include "common/byteutils.hpp"