From 6faab84af4d8af14bdbce5c6432e170036a29828 Mon Sep 17 00:00:00 2001
From: Victor Drobny <vdrobny@yandex.ru>
Date: Mon, 5 Feb 2018 17:21:16 +0300
Subject: [PATCH] merge from develop

Signed-off-by: Victor Drobny <vdrobny@yandex.ru>
---
 irohad/ametsuchi/block_query.hpp                | 2 +-
 irohad/ametsuchi/impl/mutable_storage_impl.hpp  | 2 ++
 irohad/ametsuchi/impl/postgres_block_query.hpp  | 1 -
 irohad/ametsuchi/impl/postgres_wsv_common.hpp   | 1 +
 irohad/ametsuchi/impl/storage_impl.cpp          | 2 --
 irohad/ametsuchi/impl/storage_impl.hpp          | 4 ----
 test/module/irohad/ametsuchi/ametsuchi_test.cpp | 2 +-
 7 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/irohad/ametsuchi/block_query.hpp b/irohad/ametsuchi/block_query.hpp
index a31db2262c..9fe1d57594 100644
--- 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
index f3fe6cd418..e9e22196e9 100644
--- 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
index d66d13fc67..e738cfc398 100644
--- 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
index 1f76e2af1c..81040a1a25 100644
--- 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
index 4c2e206f3b..5f0ce170d3 100644
--- 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
index 11933938a7..5dba50327d 100644
--- 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
index 20ab778c2d..e7287a216c 100644
--- 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"