address PR comments

AntelopeIO · Mar 15, 2023 · e6020fb · e6020fb
1 parent 75fb80b
commit e6020fb
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
@@ -474,7 +474,7 @@ namespace eosio { namespace chain {
          virtual void     reset(const chain_id_type& chain_id, uint32_t first_block_num)      = 0;
          virtual void     flush()                                                             = 0;
 
-         virtual signed_block_ptr            read_block_by_num(uint32_t block_num)        = 0;
+         virtual signed_block_ptr                   read_block_by_num(uint32_t block_num)        = 0;
          virtual std::optional<signed_block_header> read_block_header_by_num(uint32_t block_num) = 0;
 
          virtual uint32_t version() const = 0;
@@ -1231,6 +1231,7 @@ namespace eosio { namespace chain {
    }
 
    block_id_type block_log::read_block_id_by_num(uint32_t block_num) const {
+      // read_block_header_by_num acquires mutex
       auto bh = read_block_header_by_num(block_num);
       if (bh) { return bh->calculate_id(); }
       return {};

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
@@ -3093,18 +3093,20 @@ const global_property_object& controller::get_global_properties()const {
   return my->db.get<global_property_object>();
 }
 
-signed_block_ptr controller::fetch_block_by_id( block_id_type id )const {
+signed_block_ptr controller::fetch_block_by_id( const block_id_type& id )const {
    auto state = my->fork_db.get_block(id);
    if( state && state->block ) return state->block;
    auto bptr = my->blog.read_block_by_num( block_header::num_from_id(id) );
    if( bptr && bptr->calculate_id() == id ) return bptr;
    return signed_block_ptr();
 }
 
-std::optional<signed_block_header> controller::fetch_block_header_by_id( block_id_type id )const {
+std::optional<signed_block_header> controller::fetch_block_header_by_id( const block_id_type& id )const {
    auto state = my->fork_db.get_block(id);
    if( state && state->block ) return state->header;
-   return my->blog.read_block_header_by_num( block_header::num_from_id(id) );
+   auto result = my->blog.read_block_header_by_num( block_header::num_from_id(id) );
+   if( result && result->calculate_id() == id ) return result;
+   return {};
 }
 
 signed_block_ptr controller::fetch_block_by_number( uint32_t block_num )const  { try {

diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
@@ -239,11 +239,11 @@ namespace eosio { namespace chain {
          // thread-safe
          signed_block_ptr fetch_block_by_number( uint32_t block_num )const;
          // thread-safe
-         signed_block_ptr fetch_block_by_id( block_id_type id )const;
+         signed_block_ptr fetch_block_by_id( const block_id_type& id )const;
          // thread-safe
          std::optional<signed_block_header> fetch_block_header_by_number( uint32_t block_num )const;
          // thread-safe
-         std::optional<signed_block_header> fetch_block_header_by_id( block_id_type id )const;
+         std::optional<signed_block_header> fetch_block_header_by_id( const block_id_type& id )const;
          // return block_state from forkdb, thread-safe
          block_state_ptr fetch_block_state_by_number( uint32_t block_num )const;
          // return block_state from forkdb, thread-safe

diff --git a/tests/chain_plugin_tests.cpp b/tests/chain_plugin_tests.cpp
@@ -120,6 +120,14 @@ BOOST_FIXTURE_TEST_CASE( get_block_with_invalid_abi, TESTER ) try {
    BOOST_TEST(block_str2.find("Should Not Assert!") == std::string::npos); // decode failed
    BOOST_TEST(block_str2.find("011253686f756c64204e6f742041737365727421") != std::string::npos); //action data
 
+
+   chain_apis::read_only::get_block_header_params bh_param{headnumstr, false};
+   auto get_bh_result = plugin.get_block_header(bh_param, fc::time_point::maximum());
+
+   BOOST_TEST(get_bh_result.id == block->calculate_id());
+   BOOST_TEST(json::to_string(get_bh_result.signed_block_header, fc::time_point::maximum()) ==
+              json::to_string(fc::variant{static_cast<signed_block_header&>(*block)}, fc::time_point::maximum()));
+
 } FC_LOG_AND_RETHROW() /// get_block_with_invalid_abi
 
 BOOST_FIXTURE_TEST_CASE( get_consensus_parameters, TESTER ) try {