From 89b23bf0d280ba8d3ed978482f20427c14e50c06 Mon Sep 17 00:00:00 2001 From: Nikita Alekseev Date: Wed, 18 Jul 2018 14:00:48 +0300 Subject: [PATCH] Fix issues Signed-off-by: Nikita Alekseev # Conflicts: # test/module/shared_model/backend_proto/CMakeLists.txt --- irohad/ametsuchi/impl/postgres_wsv_command.cpp | 2 +- irohad/ametsuchi/impl/postgres_wsv_query.hpp | 2 -- test/module/libs/common/CMakeLists.txt | 3 --- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/irohad/ametsuchi/impl/postgres_wsv_command.cpp b/irohad/ametsuchi/impl/postgres_wsv_command.cpp index 9474072ee2..fae2254c83 100644 --- a/irohad/ametsuchi/impl/postgres_wsv_command.cpp +++ b/irohad/ametsuchi/impl/postgres_wsv_command.cpp @@ -18,9 +18,9 @@ #include "ametsuchi/impl/postgres_wsv_command.hpp" #include + #include "backend/protobuf/permissions.hpp" #include "interfaces/common_objects/asset.hpp" -#include "interfaces/common_objects/account_asset.hpp" namespace iroha { namespace ametsuchi { diff --git a/irohad/ametsuchi/impl/postgres_wsv_query.hpp b/irohad/ametsuchi/impl/postgres_wsv_query.hpp index a23485d406..ee648b83b2 100644 --- a/irohad/ametsuchi/impl/postgres_wsv_query.hpp +++ b/irohad/ametsuchi/impl/postgres_wsv_query.hpp @@ -20,8 +20,6 @@ #include "ametsuchi/wsv_query.hpp" -#include - #include "interfaces/common_objects/common_objects_factory.hpp" #include "postgres_wsv_common.hpp" diff --git a/test/module/libs/common/CMakeLists.txt b/test/module/libs/common/CMakeLists.txt index c84c7262ec..203c081310 100644 --- a/test/module/libs/common/CMakeLists.txt +++ b/test/module/libs/common/CMakeLists.txt @@ -19,6 +19,3 @@ addtest(result_test result_test.cpp) target_link_libraries(result_test libs_common ) - -add_library(optional_test - optinal_test.cpp)