removed circular dependency between ametsuchi & pg_connection_init

Signed-off-by: Mikhail Boldyrev <miboldyrev@gmail.com>
hyperledger · Aug 13, 2019 · ac23884 · ac23884
1 parent 29008a0
commit ac23884
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/irohad/main/CMakeLists.txt b/irohad/main/CMakeLists.txt
@@ -26,7 +26,6 @@ target_link_libraries(raw_block_loader
 
 add_library(pg_connection_init impl/pg_connection_init.cpp)
 target_link_libraries(pg_connection_init
-    ametsuchi
     SOCI::postgresql
     SOCI::core
     failover_callback

diff --git a/irohad/main/impl/pg_connection_init.cpp b/irohad/main/impl/pg_connection_init.cpp
@@ -5,6 +5,7 @@
 
 #include "main/impl/pg_connection_init.hpp"
 
+#include "ametsuchi/impl/pool_wrapper.hpp"
 #include "logger/logger.hpp"
 #include "logger/logger_manager.hpp"
 

diff --git a/irohad/main/impl/pg_connection_init.hpp b/irohad/main/impl/pg_connection_init.hpp
@@ -14,7 +14,6 @@
 #include <boost/range/algorithm/replace_if.hpp>
 
 #include "ametsuchi/impl/failover_callback_holder.hpp"
-#include "ametsuchi/impl/pool_wrapper.hpp"
 #include "ametsuchi/impl/postgres_command_executor.hpp"
 #include "ametsuchi/impl/postgres_options.hpp"
 #include "ametsuchi/reconnection_strategy.hpp"
@@ -25,6 +24,9 @@
 
 namespace iroha {
   namespace ametsuchi {
+
+    struct PoolWrapper;
+
     class PgConnectionInit {
      public:
       static expected::Result<std::shared_ptr<soci::connection_pool>,

diff --git a/test/system/CMakeLists.txt b/test/system/CMakeLists.txt
@@ -5,6 +5,7 @@
 
 addtest(irohad_test irohad_test.cpp)
 target_link_libraries(irohad_test
+        ametsuchi
         boost
         SOCI::postgresql
         SOCI::core

diff --git a/test/system/irohad_test.cpp b/test/system/irohad_test.cpp
@@ -18,6 +18,7 @@
 #include <boost/process.hpp>
 #include <boost/variant.hpp>
 
+#include "ametsuchi/impl/postgres_options.hpp"
 #include "backend/protobuf/query_responses/proto_query_response.hpp"
 #include "common/bind.hpp"
 #include "common/files.hpp"