project restructure consensus

Signed-off-by: iceseer <iceseer@gmail.com>
qdrvm · Nov 24, 2022 · 171e3de · 171e3de
1 parent 72226eb
commit 171e3de
Show file tree

Hide file tree

Showing 20 changed files with 70 additions and 286 deletions.
diff --git a/core/api/CMakeLists.txt b/core/api/CMakeLists.txt
@@ -64,7 +64,7 @@ target_link_libraries(api
     storage
     blob
     metadata_api
-    babe
+    consensus
     ss58_codec
     outcome
     build_version

diff --git a/core/consensus/CMakeLists.txt b/core/consensus/CMakeLists.txt
@@ -3,7 +3,55 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_subdirectory(validation)
-add_subdirectory(babe)
-add_subdirectory(grandpa)
-add_subdirectory(authority)
+add_library(consensus
+    authority/impl/schedule_node.cpp
+    authority/impl/authority_manager_impl.cpp
+    authority/authority_update_observer_error.cpp
+    authority/authority_manager_error.cpp
+    babe/impl/babe_digests_util.cpp
+    babe/impl/babe_config_node.cpp
+    babe/impl/block_executor_impl.cpp
+    babe/impl/babe_impl.cpp
+    babe/impl/threshold_util.cpp
+    babe/impl/babe_lottery_impl.cpp
+    babe/impl/babe_config_repository_impl.cpp
+    babe/impl/block_appender_impl.cpp
+    babe/impl/consistency_keeper_impl.cpp
+    babe/babe_error.cpp
+    validation/babe_block_validator.cpp
+    grandpa/impl/vote_tracker_impl.cpp
+    grandpa/impl/vote_crypto_provider_impl.cpp
+    grandpa/impl/grandpa_impl.cpp
+    grandpa/impl/voting_round_impl.cpp
+    grandpa/impl/environment_impl.cpp
+    grandpa/vote_graph/vote_graph_error.cpp
+    grandpa/vote_graph/vote_graph_impl.cpp
+    grandpa/voter_set.cpp
+    grandpa/voting_round_error.cpp
+    )
+target_link_libraries(consensus
+    mp_utils
+    ed25519_types
+    Boost::boost
+    schnorrkel_crust::schnorrkel_crust
+    transaction_pool_error
+    hasher
+    vrf_provider
+    logger
+    scale::scale
+    primitives
+    blob
+    outcome
+    p2p::p2p_peer_id
+    storage
+    metrics
+    blockchain
+    telemetry
+    )
+kagome_install(consensus)
+add_custom_command(TARGET consensus
+    POST_BUILD
+    COMMAND find ${CMAKE_CURRENT_BINARY_DIR} -name "*.o" -type f -delete
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    COMMENT "Removing object files from '${CMAKE_CURRENT_BINARY_DIR}'"
+)
diff --git a/core/consensus/authority/CMakeLists.txt b/core/consensus/authority/CMakeLists.txt
diff --git a/core/consensus/authority/impl/CMakeLists.txt b/core/consensus/authority/impl/CMakeLists.txt
diff --git a/core/consensus/babe/CMakeLists.txt b/core/consensus/babe/CMakeLists.txt
diff --git a/core/consensus/babe/impl/CMakeLists.txt b/core/consensus/babe/impl/CMakeLists.txt
diff --git a/core/consensus/grandpa/CMakeLists.txt b/core/consensus/grandpa/CMakeLists.txt
diff --git a/core/consensus/grandpa/vote_graph/CMakeLists.txt b/core/consensus/grandpa/vote_graph/CMakeLists.txt
diff --git a/core/consensus/validation/CMakeLists.txt b/core/consensus/validation/CMakeLists.txt
diff --git a/core/crypto/CMakeLists.txt b/core/crypto/CMakeLists.txt
@@ -43,6 +43,7 @@ target_link_libraries(vrf_provider
     blob
     p2p::p2p_random_generator # generator from libp2p
     )
+kagome_install(vrf_provider)
 
 add_library(sr25519_provider
     sr25519/sr25519_provider_impl.cpp

diff --git a/core/injector/CMakeLists.txt b/core/injector/CMakeLists.txt
@@ -17,12 +17,8 @@ target_link_libraries(application_injector
     authority_discovery_api
     print_chain_info_mode
     assets
-    authority_manager
-    babe
     storage
     babe_api
-    babe_lottery
-    babe_config_repository
     binaryen_executor_factory
     binaryen_runtime_external_interface
     binaryen_wasm_memory
@@ -31,18 +27,15 @@ target_link_libraries(application_injector
     module_repository
     binaryen_module_factory
     bip39_provider
-    block_appender
     block_builder_api
-    block_executor
+    consensus
     blockchain
-    block_validator
     clock
     chain_spec
     core_api
     crypto_store
     ecdsa_provider
     ed25519_provider
-    environment
     transaction_pool
     host_api_factory
     key_file_storage
@@ -75,10 +68,8 @@ target_link_libraries(application_injector
     trie_storage_provider
     vrf_provider
     waitable_timer
-    authority_manager
     assets
     grandpa_api
-    grandpa
     p2p::p2p_loopback_stream
     offchain_worker_factory
     offchain_worker_pool

diff --git a/core/utils/CMakeLists.txt b/core/utils/CMakeLists.txt
@@ -9,7 +9,7 @@ add_executable(storage_explorer
     )
 target_link_libraries(storage_explorer
     application_injector
-    authority_manager
+    consensus
     )
 if (BACKWARD)
     add_backward(storage_explorer)

diff --git a/test/core/blockchain/CMakeLists.txt b/test/core/blockchain/CMakeLists.txt
@@ -18,7 +18,7 @@ addtest(block_tree_test
 target_link_libraries(block_tree_test
     blockchain
     network
-    babe_digests_util
+    consensus
     logger_for_tests
     dummy_error
     )