GH-12 Move finality_core to finality dir. Remove a few more reference…

…s to hotstuff.
AntelopeIO · Apr 16, 2024 · 45f2e15 · 45f2e15
1 parent 92f57fb
commit 45f2e15
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 119 deletions.
diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
@@ -79,10 +79,11 @@ set(CHAIN_WEBASSEMBLY_SOURCES
    webassembly/transaction.cpp
 )
 
-set(CHAIN_HOTSTUFF_SOURCES
+set(CHAIN_FINALITY_SOURCES
         finality/finalizer.cpp
         finality/instant_finality_extension.cpp
         finality/quorum_certificate.cpp
+        finality/finality_core.cpp
 )
 
 add_library(eosio_rapidjson INTERFACE)
@@ -98,7 +99,6 @@ add_library( eosio_chain
              block_state.cpp
              block_header_state_legacy.cpp
              block_state_legacy.cpp
-             finality_core.cpp
              fork_database.cpp
              controller.cpp
              authorization_manager.cpp
@@ -128,7 +128,7 @@ add_library( eosio_chain
              ${CHAIN_EOSVMOC_SOURCES}
              ${CHAIN_EOSVM_SOURCES}
              ${CHAIN_WEBASSEMBLY_SOURCES}
-             ${CHAIN_HOTSTUFF_SOURCES}
+             ${CHAIN_FINALITY_SOURCES}
 
              authority.cpp
              trace.cpp

diff --git a/libraries/chain/finality_core.cpp → libraries/chain/finality/finality_core.cpp b/libraries/chain/finality_core.cpp → libraries/chain/finality/finality_core.cpp
@@ -1,4 +1,4 @@
-#include <eosio/chain/finality_core.hpp>
+#include <eosio/chain/finality/finality_core.hpp>
 #include <eosio/chain/block_header.hpp>
 
 namespace eosio::chain {

diff --git a/libraries/chain/include/eosio/chain/block_header_state.hpp b/libraries/chain/include/eosio/chain/block_header_state.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include <eosio/chain/block_header.hpp>
-#include <eosio/chain/finality_core.hpp>
+#include <eosio/chain/finality/finality_core.hpp>
 #include <eosio/chain/protocol_feature_manager.hpp>
 #include <eosio/chain/finality/quorum_certificate.hpp>
 #include <eosio/chain/finality/finalizer_policy.hpp>

diff --git a/libraries/chain/include/eosio/chain/block_header_state_legacy.hpp b/libraries/chain/include/eosio/chain/block_header_state_legacy.hpp
@@ -15,7 +15,7 @@ namespace snapshot_detail {
 namespace detail {
    struct schedule_info {
       // schedule_lib_num is compared with dpos lib, but the value is actually current block at time of pending
-      // After hotstuff is activated, schedule_lib_num is compared to next().next() round for determination of
+      // After Savanna is activated, schedule_lib_num is compared to next().next() round for determination of
       // changing from pending to active.
       uint32_t                          schedule_lib_num = 0; /// block_num of pending
       digest_type                       schedule_hash;

diff --git a/...ain/include/eosio/chain/finality_core.hpp → ...de/eosio/chain/finality/finality_core.hpp b/...ain/include/eosio/chain/finality_core.hpp → ...de/eosio/chain/finality/finality_core.hpp
diff --git a/libraries/chain/include/eosio/chain/finality/instant_finality_extension.hpp b/libraries/chain/include/eosio/chain/finality/instant_finality_extension.hpp
@@ -2,7 +2,7 @@
 
 #include <eosio/chain/finality/finalizer_policy.hpp>
 #include <eosio/chain/finality/proposer_policy.hpp>
-#include <eosio/chain/finality_core.hpp>
+#include <eosio/chain/finality/finality_core.hpp>
 
 namespace eosio::chain {
 

diff --git a/libraries/chain/include/eosio/chain/finality/quorum_certificate.hpp b/libraries/chain/include/eosio/chain/finality/quorum_certificate.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <eosio/chain/block_timestamp.hpp>
-#include <eosio/chain/finality_core.hpp>
+#include <eosio/chain/finality/finality_core.hpp>
 #include <fc/crypto/bls_private_key.hpp>
 #include <fc/crypto/bls_public_key.hpp>
 #include <fc/crypto/bls_signature.hpp>

diff --git a/libraries/chain/include/eosio/chain/webassembly/interface.hpp b/libraries/chain/include/eosio/chain/webassembly/interface.hpp
@@ -174,7 +174,7 @@ namespace webassembly {
          int64_t set_proposed_producers_ex(uint64_t packed_producer_format, legacy_span<const char> packed_producer_schedule);
 
          /**
-          * Submits a finalizer set change to Hotstuff.
+          * Submits a finalizer set change.
           *
           *  // format for packed finalizer_policy
           *  struct abi_finalizer_authority {

diff --git a/libraries/libfc/test/test_bls.cpp b/libraries/libfc/test/test_bls.cpp
@@ -73,8 +73,8 @@ BOOST_AUTO_TEST_CASE(bls_sig_verif_digest) try {
 } FC_LOG_AND_RETHROW();
 
 
-//test a single key signature + verification of hotstuff tuple
-BOOST_AUTO_TEST_CASE(bls_sig_verif_hotstuff_types) try {
+//test a single key signature + verification of finality tuple
+BOOST_AUTO_TEST_CASE(bls_sig_verif_finality_types) try {
 
   bls_private_key sk = bls_private_key(seed_1);
   bls_public_key pk = sk.get_public_key();

diff --git a/libraries/libfc/test/test_hotstuff.cpp.old b/libraries/libfc/test/test_hotstuff.cpp.old
diff --git a/unittests/finality_core_tests.cpp b/unittests/finality_core_tests.cpp
@@ -1,4 +1,4 @@
-#include <eosio/chain/finality_core.hpp>
+#include <eosio/chain/finality/finality_core.hpp>
 #include <fc/crypto/sha256.hpp>
 #include <fc/bitutil.hpp>
 #include <boost/test/unit_test.hpp>

diff --git a/unittests/finality_test_cluster.cpp b/unittests/finality_test_cluster.cpp
@@ -181,7 +181,7 @@ void finality_test_cluster::setup_node(node_info& node, eosio::chain::account_na
    node.node.produce_block();
    node.node.produce_block();
 
-   // activate hotstuff
+   // activate savanna
    eosio::testing::base_tester::finalizer_policy_input policy_input = {
       .finalizers       = { {.name = "node0"_n, .weight = 1},
                             {.name = "node1"_n, .weight = 1},