Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename pending_block_header_state to pending_block_header_state_legacy #1983

Merged
merged 1 commit into from
Dec 12, 2023
Merged

Rename pending_block_header_state to pending_block_header_state_legacy #1983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions libraries/chain/block_header_state_legacy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ namespace eosio { namespace chain {
return blocknums[ index ];
}

pending_block_header_state block_header_state_legacy::next( block_timestamp_type when,
pending_block_header_state_legacy block_header_state_legacy::next( block_timestamp_type when,
uint16_t num_prev_blocks_to_confirm )const
{
pending_block_header_state result;
pending_block_header_state_legacy result;

if( when != block_timestamp_type() ) {
EOS_ASSERT( when > header.timestamp, block_validate_exception, "next block must be in the future" );
Expand Down Expand Up @@ -170,7 +170,7 @@ namespace eosio { namespace chain {
return result;
}

signed_block_header pending_block_header_state::make_block_header(
signed_block_header pending_block_header_state_legacy::make_block_header(
const checksum256_type& transaction_mroot,
const checksum256_type& action_mroot,
const std::optional<producer_authority_schedule>& new_producers,
Expand Down Expand Up @@ -221,7 +221,7 @@ namespace eosio { namespace chain {
return h;
}

block_header_state_legacy pending_block_header_state::_finish_next(
block_header_state_legacy pending_block_header_state_legacy::_finish_next(
const signed_block_header& h,
const protocol_feature_set& pfs,
const std::function<void( block_timestamp_type,
Expand Down Expand Up @@ -317,7 +317,7 @@ namespace eosio { namespace chain {
return result;
}

block_header_state_legacy pending_block_header_state::finish_next(
block_header_state_legacy pending_block_header_state_legacy::finish_next(
const signed_block_header& h,
vector<signature_type>&& additional_signatures,
const protocol_feature_set& pfs,
Expand Down Expand Up @@ -347,7 +347,7 @@ namespace eosio { namespace chain {
return result;
}

block_header_state_legacy pending_block_header_state::finish_next(
block_header_state_legacy pending_block_header_state_legacy::finish_next(
signed_block_header& h,
const protocol_feature_set& pfs,
const std::function<void( block_timestamp_type,
Expand Down
4 changes: 2 additions & 2 deletions libraries/chain/block_state_legacy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ namespace eosio { namespace chain {
*/

template<typename ...Extras>
block_header_state_legacy inject_additional_signatures( pending_block_header_state&& cur,
block_header_state_legacy inject_additional_signatures( pending_block_header_state_legacy&& cur,
signed_block& b,
const protocol_feature_set& pfs,
Extras&& ... extras )
Expand Down Expand Up @@ -86,7 +86,7 @@ namespace eosio { namespace chain {
,block( std::move(b) )
{}

block_state_legacy::block_state_legacy( pending_block_header_state&& cur,
block_state_legacy::block_state_legacy( pending_block_header_state_legacy&& cur,
signed_block_ptr&& b,
deque<transaction_metadata_ptr>&& trx_metas,
const protocol_feature_set& pfs,
Expand Down
36 changes: 18 additions & 18 deletions libraries/chain/controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,12 @@ struct building_block {
block_timestamp_type when,
uint16_t num_prev_blocks_to_confirm,
const vector<digest_type>& new_protocol_feature_activations )
:_pending_block_header_state( prev.next( when, num_prev_blocks_to_confirm ) )
:_pending_block_header_state_legacy( prev.next( when, num_prev_blocks_to_confirm ) )
,_new_protocol_feature_activations( new_protocol_feature_activations )
,_trx_mroot_or_receipt_digests( digests_t{} )
{}

pending_block_header_state _pending_block_header_state;
pending_block_header_state_legacy _pending_block_header_state_legacy;
std::optional<producer_authority_schedule> _new_pending_producer_schedule;
vector<digest_type> _new_protocol_feature_activations;
size_t _num_new_protocol_features_that_have_activated = 0;
Expand All @@ -134,7 +134,7 @@ struct building_block {

struct assembled_block {
block_id_type _id;
pending_block_header_state _pending_block_header_state;
pending_block_header_state_legacy _pending_block_header_state_legacy;
deque<transaction_metadata_ptr> _trx_metas;
signed_block_ptr _unsigned_block;

Expand Down Expand Up @@ -164,11 +164,11 @@ struct pending_state {
controller::block_report _block_report{};

/** @pre _block_stage cannot hold completed_block alternative */
const pending_block_header_state& get_pending_block_header_state()const {
const pending_block_header_state_legacy& get_pending_block_header_state_legacy()const {
if( std::holds_alternative<building_block>(_block_stage) )
return std::get<building_block>(_block_stage)._pending_block_header_state;
return std::get<building_block>(_block_stage)._pending_block_header_state_legacy;

return std::get<assembled_block>(_block_stage)._pending_block_header_state;
return std::get<assembled_block>(_block_stage)._pending_block_header_state_legacy;
}

deque<transaction_metadata_ptr> extract_trx_metas() {
Expand All @@ -184,7 +184,7 @@ struct pending_state {
bool is_protocol_feature_activated( const digest_type& feature_digest )const {
if( std::holds_alternative<building_block>(_block_stage) ) {
auto& bb = std::get<building_block>(_block_stage);
const auto& activated_features = bb._pending_block_header_state.prev_activated_protocol_features->protocol_features;
const auto& activated_features = bb._pending_block_header_state_legacy.prev_activated_protocol_features->protocol_features;

if( activated_features.find( feature_digest ) != activated_features.end() ) return true;

Expand Down Expand Up @@ -1729,7 +1729,7 @@ struct controller_impl {
pending->_producer_block_id = producer_block_id;

auto& bb = std::get<building_block>(pending->_block_stage);
const auto& pbhs = bb._pending_block_header_state;
const auto& pbhs = bb._pending_block_header_state_legacy;

// block status is either ephemeral or incomplete. Modify state of speculative block only if we are building a
// speculative incomplete block (otherwise we need clean state for head mode, ephemeral block)
Expand Down Expand Up @@ -1867,7 +1867,7 @@ struct controller_impl {

try {

auto& pbhs = pending->get_pending_block_header_state();
auto& pbhs = pending->get_pending_block_header_state_legacy();

auto& bb = std::get<building_block>(pending->_block_stage);

Expand Down Expand Up @@ -1926,7 +1926,7 @@ struct controller_impl {

pending->_block_stage = assembled_block{
id,
std::move( bb._pending_block_header_state ),
std::move( bb._pending_block_header_state_legacy ),
std::move( bb._pending_trx_metas ),
std::move( block_ptr ),
std::move( bb._new_pending_producer_schedule )
Expand Down Expand Up @@ -2437,7 +2437,7 @@ struct controller_impl {
}

void update_producers_authority() {
const auto& producers = pending->get_pending_block_header_state().active_schedule.producers;
const auto& producers = pending->get_pending_block_header_state_legacy().active_schedule.producers;

auto update_permission = [&]( auto& permission, auto threshold ) {
auto auth = authority( threshold, {}, {});
Expand Down Expand Up @@ -2949,7 +2949,7 @@ block_state_legacy_ptr controller::finalize_block( block_report& br, const signe
auto& ab = std::get<assembled_block>(my->pending->_block_stage);

auto bsp = std::make_shared<block_state_legacy>(
std::move( ab._pending_block_header_state ),
std::move( ab._pending_block_header_state_legacy ),
std::move( ab._unsigned_block ),
std::move( ab._trx_metas ),
my->protocol_features.get_protocol_feature_set(),
Expand Down Expand Up @@ -3106,7 +3106,7 @@ block_timestamp_type controller::pending_block_timestamp()const {
if( std::holds_alternative<completed_block>(my->pending->_block_stage) )
return std::get<completed_block>(my->pending->_block_stage)._block_state->header.timestamp;

return my->pending->get_pending_block_header_state().timestamp;
return my->pending->get_pending_block_header_state_legacy().timestamp;
}

time_point controller::pending_block_time()const {
Expand All @@ -3119,7 +3119,7 @@ uint32_t controller::pending_block_num()const {
if( std::holds_alternative<completed_block>(my->pending->_block_stage) )
return std::get<completed_block>(my->pending->_block_stage)._block_state->header.block_num();

return my->pending->get_pending_block_header_state().block_num;
return my->pending->get_pending_block_header_state_legacy().block_num;
}

account_name controller::pending_block_producer()const {
Expand All @@ -3128,7 +3128,7 @@ account_name controller::pending_block_producer()const {
if( std::holds_alternative<completed_block>(my->pending->_block_stage) )
return std::get<completed_block>(my->pending->_block_stage)._block_state->header.producer;

return my->pending->get_pending_block_header_state().producer;
return my->pending->get_pending_block_header_state_legacy().producer;
}

const block_signing_authority& controller::pending_block_signing_authority()const {
Expand All @@ -3137,7 +3137,7 @@ const block_signing_authority& controller::pending_block_signing_authority()cons
if( std::holds_alternative<completed_block>(my->pending->_block_stage) )
return std::get<completed_block>(my->pending->_block_stage)._block_state->valid_block_signing_authority;

return my->pending->get_pending_block_header_state().valid_block_signing_authority;
return my->pending->get_pending_block_header_state_legacy().valid_block_signing_authority;
}

std::optional<block_id_type> controller::pending_producer_block_id()const {
Expand Down Expand Up @@ -3293,7 +3293,7 @@ const producer_authority_schedule& controller::active_producers()const {
if( std::holds_alternative<completed_block>(my->pending->_block_stage) )
return std::get<completed_block>(my->pending->_block_stage)._block_state->active_schedule;

return my->pending->get_pending_block_header_state().active_schedule;
return my->pending->get_pending_block_header_state_legacy().active_schedule;
}

const producer_authority_schedule& controller::pending_producers()const {
Expand All @@ -3315,7 +3315,7 @@ const producer_authority_schedule& controller::pending_producers()const {
if( bb._new_pending_producer_schedule )
return *bb._new_pending_producer_schedule;

return bb._pending_block_header_state.prev_pending_schedule.schedule;
return bb._pending_block_header_state_legacy.prev_pending_schedule.schedule;
}

std::optional<producer_authority_schedule> controller::proposed_producers()const {
Expand Down
4 changes: 2 additions & 2 deletions libraries/chain/include/eosio/chain/block_header_state_legacy.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ namespace detail {
builtin_protocol_feature_t feature_codename );
}

struct pending_block_header_state : public detail::block_header_state_legacy_common {
struct pending_block_header_state_legacy : public detail::block_header_state_legacy_common {
protocol_feature_activation_set_ptr prev_activated_protocol_features;
detail::schedule_info prev_pending_schedule;
bool was_pending_promoted = false;
Expand Down Expand Up @@ -133,7 +133,7 @@ struct block_header_state_legacy : public detail::block_header_state_legacy_comm

explicit block_header_state_legacy( legacy::snapshot_block_header_state_v2&& snapshot );

pending_block_header_state next( block_timestamp_type when, uint16_t num_prev_blocks_to_confirm )const;
pending_block_header_state_legacy next( block_timestamp_type when, uint16_t num_prev_blocks_to_confirm )const;

block_header_state_legacy next( const signed_block_header& h,
vector<signature_type>&& additional_signatures,
Expand Down
2 changes: 1 addition & 1 deletion libraries/chain/include/eosio/chain/block_state_legacy.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace eosio { namespace chain {
bool skip_validate_signee
);

block_state_legacy( pending_block_header_state&& cur,
block_state_legacy( pending_block_header_state_legacy&& cur,
signed_block_ptr&& b, // unsigned block
deque<transaction_metadata_ptr>&& trx_metas,
const protocol_feature_set& pfs,
Expand Down
2 changes: 1 addition & 1 deletion plugins/chain_plugin/test/test_trx_finality_status_processing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ auto make_block_state( uint32_t block_num ) {
result.emplace_back( k.sign( d ));
return result;
};
chain::pending_block_header_state pbhs;
chain::pending_block_header_state_legacy pbhs;
pbhs.producer = block->producer;
pbhs.timestamp = block->timestamp;
pbhs.previous = block->previous;
Expand Down
2 changes: 1 addition & 1 deletion plugins/chain_plugin/test/test_trx_retry_db.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ auto make_block_state( uint32_t block_num, std::vector<chain::packed_transaction
result.emplace_back( k.sign( d ));
return result;
};
chain::pending_block_header_state pbhs;
chain::pending_block_header_state_legacy pbhs;
pbhs.producer = block->producer;
pbhs.timestamp = block->timestamp;
pbhs.previous = block->previous;
Expand Down
2 changes: 1 addition & 1 deletion plugins/trace_api_plugin/test/include/eosio/trace_api/test_common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ namespace eosio::trace_api {
result.emplace_back( k.sign( d ));
return result;
};
chain::pending_block_header_state pbhs;
chain::pending_block_header_state_legacy pbhs;
pbhs.producer = block->producer;
pbhs.timestamp = block->timestamp;
chain::producer_authority_schedule schedule = {0, {chain::producer_authority{block->producer,
Expand Down
2 changes: 1 addition & 1 deletion unittests/unapplied_transaction_queue_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ auto create_test_block_state( deque<transaction_metadata_ptr> trx_metas ) {
result.emplace_back(k.sign(d));
return result;
};
pending_block_header_state pbhs;
pending_block_header_state_legacy pbhs;
pbhs.producer = block->producer;
producer_authority_schedule schedule = { 0, { producer_authority{block->producer, block_signing_authority_v0{ 1, {{pub_key, 1}} } } } };
pbhs.active_schedule = schedule;
Expand Down