Refactor dependency in cmake model

iroha-cli/CMakeLists.txt

@@ -1,10 +1,27 @@
-set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+# GenesisBlockClient
+add_library(genesis_block_client genesis_block_client_impl.cpp)
+target_link_libraries(genesis_block_client
+    endpoint
+    optional
+    model
+    )
+
+# BootstrapNetwork
+add_library(bootstrap_network bootstrap_network.cpp)
+target_link_libraries(bootstrap_network
+    pb_model_converters
+    json_model_converters
+    genesis_block_client
+    ip_tools
+    )
 
 # Gflags config validators
 add_library(cli-flags_validators validators.cpp)
-target_link_libraries(cli-flags_validators gflags)
+target_link_libraries(cli-flags_validators gflags
+    )
 
-add_library(keys_manager impl/keys_manager_impl.cpp)
+add_library(keys_manager impl/keys_manager_impl.cpp
+    )
 target_link_libraries(keys_manager
     optional
     crypto
@@ -17,14 +34,12 @@ add_library(client
     impl/grpc_response_handler.cpp
     )
 target_link_libraries(client
-    model_converters
-    crypto
-    optional
-    logger
-    rapidjson
+    pb_model_converters
+    json_model_converters
+    model_generators
     command_client
     query_client
-    model_generators
+    logger
     )
 
 target_include_directories(client PUBLIC
@@ -39,7 +54,6 @@ add_executable(iroha-cli
 target_link_libraries(iroha-cli
     client
     cli-flags_validators
-    rapidjson
-    model
+    bootstrap_network
     keys_manager
     )

irohad/ametsuchi/CMakeLists.txt

@@ -13,12 +13,12 @@ add_library(ametsuchi
     )
 
 target_link_libraries(ametsuchi
+    json_model_converters
     logger
     rxcpp
     optional
     pqxx
     cpp_redis
-    model
     libs_common
     command_execution
     )

irohad/model/CMakeLists.txt

@@ -1,44 +1,20 @@
 add_subdirectory(generators)
+add_subdirectory(converters)
 
 add_library(model
     model_crypto_provider_impl.cpp
     model_hash_provider_impl.cpp
     impl/model_operators.cpp
-    converters/impl/pb_block_factory.cpp
-    converters/impl/pb_transaction_factory.cpp
-    converters/impl/pb_command_factory.cpp
-    converters/impl/pb_query_response_factory.cpp
     impl/query_execution.cpp
-    converters/impl/pb_query_factory.cpp
-    converters/impl/json_common.cpp
-    converters/impl/json_command_factory.cpp
-    converters/impl/json_transaction_factory.cpp
-    converters/impl/json_block_factory.cpp
     )
-
 target_link_libraries(model
-    schema
+    hash
     optional
     rxcpp
-    hash
-    crypto
-    rapidjson
     logger
     )
 
 
-add_library(model_converters
-    converters/impl/json_query_factory.cpp
-    )
-
-target_link_libraries(model_converters
-    rapidjson
-    optional
-    logger
-    model_generators
-    model
-    )
-
 add_library(model_registrations INTERFACE)
 target_include_directories(model_registrations INTERFACE
     registration

irohad/model/converters/CMakeLists.txt

@@ -5,16 +5,13 @@ add_library(json_model_converters
     impl/json_query_factory.cpp
     impl/json_transaction_factory.cpp
     )
-
 target_link_libraries(json_model_converters
+    model
+    model_generators
+    rapidjson
     schema
-    optional
-    rxcpp
-    hash
     crypto
-    rapidjson
     logger
-    model
     )
 
 add_library(pb_model_converters
@@ -24,12 +21,9 @@ add_library(pb_model_converters
     impl/pb_query_response_factory.cpp
     impl/pb_transaction_factory.cpp
     )
-
 target_link_libraries(pb_model_converters
+    model
     schema
-    optional
-    rxcpp
-    hash
     crypto
     logger
     )

irohad/network/CMakeLists.txt

@@ -14,6 +14,7 @@ add_library(block_loader
     impl/block_loader_impl.cpp
     )
 target_link_libraries(block_loader
+    pb_model_converters
     loader_grpc
     rxcpp
     model

irohad/ordering/CMakeLists.txt

@@ -18,6 +18,7 @@ add_library(ordering_service
     )
 
 target_link_libraries(ordering_service
+    pb_model_converters
     rxcpp
     optional
     tbb

irohad/torii/CMakeLists.txt

@@ -15,18 +15,19 @@ add_subdirectory(processor)
 
 add_library(command_client command_client.cpp)
 target_link_libraries(command_client
-  torii_service
-  endpoint
-  model
-)
+    torii_service
+    endpoint
+    model
+    )
 
 add_library(torii_service
-        torii_service_handler.cpp
-        impl/query_service.cpp
-        impl/command_service.cpp)
-
+    torii_service_handler.cpp
+    impl/query_service.cpp
+    impl/command_service.cpp
+    )
 target_link_libraries(torii_service
-  endpoint
-  stateless_validator
-  model
-)
+    pb_model_converters
+    endpoint
+    stateless_validator
+    model
+    )

test/integration/CMakeLists.txt

@@ -1,9 +1,12 @@
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/test_bin)
 
 add_subdirectory(consensus)
+add_subdirectory(pipeline)
 
 addtest(client_test client_test.cpp)
 target_link_libraries(client_test
+    pb_model_converters
+    json_model_converters
     client
     processors
     server_runner
@@ -12,4 +15,3 @@ target_include_directories(client_test PUBLIC
     ${PROJECT_SOURCE_DIR}/iroha-cli
     )
 
-add_subdirectory(pipeline)

test/module/irohad/common/CMakeLists.txt

@@ -8,7 +8,8 @@ AddTest(blob_converter_test blob_converter_test.cpp)
 
 AddTest(block_insertion_test block_insertion_test.cpp)
 target_link_libraries(block_insertion_test
-    model
+    json_model_converters
+    genesis_block_server
     test_block_generator
     raw_block_insertion
     logger

test/module/irohad/model/CMakeLists.txt

@@ -28,22 +28,22 @@ target_link_libraries(model_crypto_provider_test
 
 addtest(command_converter_test converters/pb_commands_test.cpp)
 target_link_libraries(command_converter_test
-    model
+    pb_model_converters
     )
 
 addtest(transaction_converter_test converters/pb_transaction_test.cpp)
 target_link_libraries(transaction_converter_test
-    model
+    pb_model_converters
     )
 
 addtest(block_converter_test converters/pb_block_test.cpp)
 target_link_libraries(block_converter_test
-    model
+    pb_model_converters
     )
 
 addtest(query_responses_test converters/pb_query_responses_test.cpp)
 target_link_libraries(query_responses_test
-    model
+    pb_model_converters
     )
 
 addtest(model_operators_test operators/model_operators_test.cpp)
@@ -59,22 +59,29 @@ target_link_libraries(command_validate_execute_test
 
 addtest(json_command_converter_test converters/json_commands_test.cpp)
 target_link_libraries(json_command_converter_test
-    model
+    json_model_converters
     )
 
 addtest(json_transaction_converter_test converters/json_transaction_test.cpp)
 target_link_libraries(json_transaction_converter_test
-    model
+    json_model_converters
     )
 
 addtest(json_block_converter_test converters/json_block_test.cpp)
 target_link_libraries(json_block_converter_test
-    model
+    json_model_converters
     )
 
 addtest(json_query_factory_test converters/json_query_factory_test.cpp)
 target_link_libraries(json_query_factory_test
-    model_converters
+    model_generators
+    json_model_converters
+    )
+
+addtest(pb_query_factory_test converters/pb_query_factory_test.cpp)
+target_link_libraries(pb_query_factory_test
+    model_generators
+    pb_model_converters
     )
 
 addtest(static_map static_map.cpp)
@@ -83,9 +90,3 @@ target_link_libraries(static_map
     logger
     )
 
-addtest(pb_query_factory_test converters/pb_query_factory_test.cpp)
-target_link_libraries(pb_query_factory_test
-    model
-    model_generators
-    )
-