Refactor/disable compatibility (#1348)

x3medima17 · web-flow · commit 21b0c8da20af · 2018-05-18T18:32:26.000+03:00
* Fix build errors

Signed-off-by: Dumitru &lt;dimasavva17@gmail.com&gt;

* Move linked library to the right place

Signed-off-by: Dumitru &lt;dimasavva17@gmail.com&gt;

* Fixed link error

Signed-off-by: Dumitru &lt;dimasavva17@gmail.com&gt;
diff --git a/iroha-cli/main.cpp b/iroha-cli/main.cpp
@@ -19,12 +19,10 @@
 #include <rapidjson/istreamwrapper.h>
 #include <rapidjson/rapidjson.h>
 #include <boost/filesystem.hpp>
-#include <fstream>
 #include <iostream>
 
 #include "backend/protobuf/queries/proto_query.hpp"
 #include "client.hpp"
-#include "common/assert_config.hpp"
 #include "converters/protobuf/json_proto_converter.hpp"
 #include "crypto/keys_manager_impl.hpp"
 #include "grpc_response_handler.hpp"
@@ -36,7 +34,6 @@
 #include "model/converters/pb_transaction_factory.hpp"
 #include "model/generators/block_generator.hpp"
 #include "model/model_crypto_provider_impl.hpp"
-#include "validators.hpp"
 
 // Account information
 DEFINE_bool(new_account,
diff --git a/irohad/consensus/yac/CMakeLists.txt b/irohad/consensus/yac/CMakeLists.txt
@@ -43,4 +43,5 @@ target_link_libraries(yac
     yac_grpc
     logger
     hash
+    shared_model_proto_backend
     )
diff --git a/irohad/execution/CMakeLists.txt b/irohad/execution/CMakeLists.txt
@@ -39,4 +39,5 @@ add_library(query_execution
 target_link_libraries(query_execution
         rxcpp
         shared_model_default_builders
+        common_execution
         )
diff --git a/irohad/network/CMakeLists.txt b/irohad/network/CMakeLists.txt
@@ -18,6 +18,8 @@ target_link_libraries(block_loader
     loader_grpc
     rxcpp
     shared_model_interfaces
+    shared_model_proto_backend
+    logger
     )
 
 add_library(block_loader_service
diff --git a/irohad/torii/CMakeLists.txt b/irohad/torii/CMakeLists.txt
@@ -36,4 +36,5 @@ target_link_libraries(torii_service
     shared_model_proto_backend
     logger
     shared_model_stateless_validation
+    processors
     )
diff --git a/irohad/torii/processor/CMakeLists.txt b/irohad/torii/processor/CMakeLists.txt
@@ -8,4 +8,5 @@ target_link_libraries(processors PUBLIC
     logger
     endpoint
     shared_model_proto_builders
+    query_execution
     )
diff --git a/test/integration/transport/CMakeLists.txt b/test/integration/transport/CMakeLists.txt
@@ -6,4 +6,5 @@ target_link_libraries(ordering_gate_service_test
         ordering_service
         shared_model_stateless_validation
         shared_model_cryptography_model
+        iroha_amount
     )
diff --git a/test/module/iroha-cli/client_test.cpp b/test/module/iroha-cli/client_test.cpp
@@ -207,7 +207,7 @@ TEST_F(ClientServerTest, SendQueryWhenStatelessInvalid) {
   ASSERT_TRUE(res.status.ok());
   ASSERT_TRUE(res.answer.has_error_response());
   ASSERT_EQ(res.answer.error_response().reason(),
-            iroha::model::ErrorResponse::STATELESS_INVALID);
+            iroha::protocol::ErrorResponse::STATELESS_INVALID);
   ASSERT_NE(res.answer.error_response().message().size(), 0);
 }
 
@@ -247,9 +247,6 @@ TEST_F(ClientServerTest, SendQueryWhenValid) {
 TEST_F(ClientServerTest, SendQueryWhenStatefulInvalid) {
   iroha_cli::CliClient client(Ip, Port);
 
-  auto account_test = iroha::model::Account();
-  account_test.account_id = "test@test";
-
   EXPECT_CALL(*wsv_query, getSignatories("admin@test"))
       .WillRepeatedly(Return(signatories));
 
diff --git a/test/module/irohad/ordering/CMakeLists.txt b/test/module/irohad/ordering/CMakeLists.txt
@@ -16,11 +16,13 @@ addtest(ordering_service_test ordering_service_test.cpp)
 target_link_libraries(ordering_service_test
     ordering_service
     shared_model_stateless_validation
+    iroha_amount
     )
 
 addtest(ordering_gate_test ordering_gate_test.cpp)
 target_link_libraries(ordering_gate_test
     ordering_service
     shared_model_cryptography_model
     shared_model_stateless_validation
+    iroha_amount
     )
diff --git a/test/module/irohad/synchronizer/CMakeLists.txt b/test/module/irohad/synchronizer/CMakeLists.txt
@@ -2,6 +2,7 @@ addtest(synchronizer_test synchronizer_test.cpp)
 target_link_libraries(synchronizer_test
     synchronizer
     shared_model_cryptography
+    shared_model_proto_backend
     )
 
 
diff --git a/test/module/irohad/validation/query_execution.cpp b/test/module/irohad/validation/query_execution.cpp
@@ -38,7 +38,6 @@ using ::testing::_;
 
 using namespace iroha;
 using namespace iroha::ametsuchi;
-using namespace iroha::model;
 using namespace framework::test_subscriber;
 using namespace shared_model::permissions;
 
@@ -118,7 +117,6 @@ class QueryValidateExecuteTest : public ::testing::Test {
   std::shared_ptr<MockBlockQuery> block_query;
 
   std::shared_ptr<QueryProcessingFactory> factory;
-  std::shared_ptr<Query> query;
 };
 
 class GetAccountTest : public QueryValidateExecuteTest {
@@ -1277,7 +1275,6 @@ class GetRolesTest : public QueryValidateExecuteTest {
     roles = {admin_role, "some_role"};
   }
   std::vector<std::string> roles;
-  std::shared_ptr<GetRoles> qry;
 };
 
 /**
@@ -1359,7 +1356,6 @@ class GetRolePermissionsTest : public QueryValidateExecuteTest {
   }
   std::string role_id = "user";
   std::vector<std::string> perms;
-  std::shared_ptr<GetRolePermissions> qry;
 };
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -43,4 +43,5 @@ target_link_libraries(yac`
`43`	`43`	`yac_grpc`
`44`	`44`	`logger`
`45`	`45`	`hash`
	`46`	`+ shared_model_proto_backend`
`46`	`47`	`)`
Original file line number	Diff line number	Diff line change
`@@ -39,4 +39,5 @@ add_library(query_execution`
`39`	`39`	`target_link_libraries(query_execution`
`40`	`40`	`rxcpp`
`41`	`41`	`shared_model_default_builders`
	`42`	`+ common_execution`
`42`	`43`	`)`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@ target_link_libraries(block_loader`
`18`	`18`	`loader_grpc`
`19`	`19`	`rxcpp`
`20`	`20`	`shared_model_interfaces`
	`21`	`+ shared_model_proto_backend`
	`22`	`+ logger`
`21`	`23`	`)`
`22`	`24`
`23`	`25`	`add_library(block_loader_service`
Original file line number	Diff line number	Diff line change
`@@ -36,4 +36,5 @@ target_link_libraries(torii_service`
`36`	`36`	`shared_model_proto_backend`
`37`	`37`	`logger`
`38`	`38`	`shared_model_stateless_validation`
	`39`	`+ processors`
`39`	`40`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,5 @@ target_link_libraries(processors PUBLIC`
`8`	`8`	`logger`
`9`	`9`	`endpoint`
`10`	`10`	`shared_model_proto_builders`
	`11`	`+ query_execution`
`11`	`12`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,5 @@ target_link_libraries(ordering_gate_service_test`
`6`	`6`	`ordering_service`
`7`	`7`	`shared_model_stateless_validation`
`8`	`8`	`shared_model_cryptography_model`
	`9`	`+ iroha_amount`
`9`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,13 @@ addtest(ordering_service_test ordering_service_test.cpp)`
`16`	`16`	`target_link_libraries(ordering_service_test`
`17`	`17`	`ordering_service`
`18`	`18`	`shared_model_stateless_validation`
	`19`	`+ iroha_amount`
`19`	`20`	`)`
`20`	`21`
`21`	`22`	`addtest(ordering_gate_test ordering_gate_test.cpp)`
`22`	`23`	`target_link_libraries(ordering_gate_test`
`23`	`24`	`ordering_service`
`24`	`25`	`shared_model_cryptography_model`
`25`	`26`	`shared_model_stateless_validation`
	`27`	`+ iroha_amount`
`26`	`28`	`)`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ addtest(synchronizer_test synchronizer_test.cpp)`
`2`	`2`	`target_link_libraries(synchronizer_test`
`3`	`3`	`synchronizer`
`4`	`4`	`shared_model_cryptography`
	`5`	`+ shared_model_proto_backend`
`5`	`6`	`)`
`6`	`7`
`7`	`8`