From eddea59da2d664c92458fde6ce4055e5a985abd1 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 20 Dec 2023 21:38:30 -0600
Subject: [PATCH] GH-1941 Remove fetch_block_state_by_number()

---
 libraries/chain/controller.cpp                     | 10 +++-------
 libraries/chain/hotstuff/chain_pacemaker.cpp       |  3 ++-
 libraries/chain/include/eosio/chain/controller.hpp |  2 --
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 8f45a640e8..167a5875b6 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -3636,7 +3636,7 @@ std::optional<signed_block_header> controller::fetch_block_header_by_id( const b
 }
 
 signed_block_ptr controller::fetch_block_by_number( uint32_t block_num )const  { try {
-   auto blk_state = fetch_block_state_by_number( block_num );
+   auto blk_state = my->fork_db.search_on_branch( fork_db_head_block_id(), block_num );
    if( blk_state ) {
       return blk_state->block;
    }
@@ -3645,7 +3645,7 @@ signed_block_ptr controller::fetch_block_by_number( uint32_t block_num )const  {
 } FC_CAPTURE_AND_RETHROW( (block_num) ) }
 
 std::optional<signed_block_header> controller::fetch_block_header_by_number( uint32_t block_num )const  { try {
-   auto blk_state = fetch_block_state_by_number( block_num );
+   auto blk_state = my->fork_db.search_on_branch( fork_db_head_block_id(), block_num );
    if( blk_state ) {
       return blk_state->header;
    }
@@ -3658,17 +3658,13 @@ block_state_legacy_ptr controller::fetch_block_state_by_id( block_id_type id )co
    return state;
 }
 
-block_state_legacy_ptr controller::fetch_block_state_by_number( uint32_t block_num )const  { try {
-   return my->fork_db.search_on_branch( fork_db_head_block_id(), block_num );
-} FC_CAPTURE_AND_RETHROW( (block_num) ) }
-
 block_id_type controller::get_block_id_for_num( uint32_t block_num )const { try {
    const auto& blog_head = my->blog.head();
 
    bool find_in_blog = (blog_head && block_num <= blog_head->block_num());
 
    if( !find_in_blog ) {
-      auto bsp = fetch_block_state_by_number( block_num );
+      auto bsp = my->fork_db.search_on_branch( fork_db_head_block_id(), block_num );
       if( bsp ) return bsp->id();
    }
 
diff --git a/libraries/chain/hotstuff/chain_pacemaker.cpp b/libraries/chain/hotstuff/chain_pacemaker.cpp
index 0416666f26..131f71f170 100644
--- a/libraries/chain/hotstuff/chain_pacemaker.cpp
+++ b/libraries/chain/hotstuff/chain_pacemaker.cpp
@@ -162,7 +162,8 @@ namespace eosio::chain {
    // called from main thread
    void chain_pacemaker::on_accepted_block( const signed_block_ptr& block ) {
       std::scoped_lock g( _chain_state_mutex );
-      _head_block_state = _chain->fetch_block_state_by_number(block->block_num());
+      // TODO: assume this is going away
+      _head_block_state = _chain->head_block_state_legacy();
    }
 
    // called from main thread
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index ebefb257a3..09c3679db8 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -268,8 +268,6 @@ namespace eosio::chain {
          // thread-safe
          std::optional<signed_block_header> fetch_block_header_by_id( const block_id_type& id )const;
          // return block_state_legacy from forkdb, thread-safe
-         block_state_legacy_ptr fetch_block_state_by_number( uint32_t block_num )const;
-         // return block_state_legacy from forkdb, thread-safe
          block_state_legacy_ptr fetch_block_state_by_id( block_id_type id )const;
          // thread-safe
          block_id_type get_block_id_for_num( uint32_t block_num )const;