GH-2125 Fix compile error and some more type name changes

AntelopeIO · Mar 1, 2024 · e3059bf · e3059bf
1 parent ee5291f
commit e3059bf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
@@ -2808,7 +2808,7 @@ struct controller_impl {
                const auto& if_ext = std::get<instant_finality_extension>(bsp->header_exts.lower_bound(if_ext_id)->second);
                if (if_ext.qc_claim.is_strong_qc) {
                   // claim has already been verified
-                  auto claimed = forkdb.search_branch(bsp->id(), if_ext.qc_claim.block_num);
+                  auto claimed = forkdb.search_on_branch(bsp->id(), if_ext.qc_claim.block_num);
                   if (claimed) {
                      set_if_irreversible_block_num(claimed->core.final_on_strong_qc_block_num);
                   }

diff --git a/libraries/chain/fork_database.cpp b/libraries/chain/fork_database.cpp
@@ -657,13 +657,13 @@ namespace eosio::chain {
    }
 
    template<class BSP>
-   void fork_database_t<BSP>::mark_valid( const BSP& h ) {
+   void fork_database_t<BSP>::mark_valid( const bsp_t& h ) {
       std::lock_guard g( my->mtx );
       my->mark_valid_impl( h );
    }
 
    template<class BSP>
-   void fork_database_impl<BSP>::mark_valid_impl( const BSP& h ) {
+   void fork_database_impl<BSP>::mark_valid_impl( const bsp_t& h ) {
       if( bs_accessor_t::is_valid(*h) ) return;
 
       auto& by_id_idx = index.template get<by_block_id>();

diff --git a/libraries/chain/include/eosio/chain/fork_database.hpp b/libraries/chain/include/eosio/chain/fork_database.hpp
@@ -4,7 +4,7 @@
 
 namespace eosio::chain {
 
-   template<class bsp>
+   template<class BSP>
    struct fork_database_impl;
 
    using block_branch_t = std::vector<signed_block_ptr>;