Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

account_evaluator.cpp: Refactor verify_account_votes() into own method #611

Browse source
This commit is contained in:
theoreticalbts 2016-03-07 13:49:23 -05:00
parent 4138ec29cc
commit 241a7b0c3a
1 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
libraries/chain/account_evaluator.cpp
View file

@ -54,6 +54,28 @@ void verify_authority_accounts( const database& db, const authority& a )
} }
} }
void verify_account_votes( const database& db, const account_options& options )
{
// ensure account's votes satisfy requirements
// NB only the part of vote checking that requires chain state is here,
// the rest occurs in account_options::validate()
const auto& gpo = db.get_global_properties();
const auto& chain_params = gpo.parameters;
FC_ASSERT( options.num_witness <= chain_params.maximum_witness_count,
"Voted for more witnesses than currently allowed (${c})", ("c", chain_params.maximum_witness_count) );
FC_ASSERT( options.num_committee <= chain_params.maximum_committee_count,
"Voted for more committee members than currently allowed (${c})", ("c", chain_params.maximum_committee_count) );
uint32_t max_vote_id = gpo.next_available_vote_id;
for( auto id : options.votes )
{
FC_ASSERT( id < max_vote_id );
}
}
void_result account_create_evaluator::do_evaluate( const account_create_operation& op ) void_result account_create_evaluator::do_evaluate( const account_create_operation& op )
{ try { { try {
database& d = db(); database& d = db();
@ -67,9 +89,6 @@ void_result account_create_evaluator::do_evaluate( const account_create_operatio
FC_ASSERT( fee_paying_account->is_lifetime_member(), "Only Lifetime members may register an account." ); FC_ASSERT( fee_paying_account->is_lifetime_member(), "Only Lifetime members may register an account." );
FC_ASSERT( op.referrer(d).is_member(d.head_block_time()), "The referrer must be either a lifetime or annual subscriber." ); FC_ASSERT( op.referrer(d).is_member(d.head_block_time()), "The referrer must be either a lifetime or annual subscriber." );
const auto& global_props = d.get_global_properties();
const auto& chain_params = global_props.parameters;
try try
{ {
verify_authority_accounts( d, op.owner ); verify_authority_accounts( d, op.owner );
@ -84,17 +103,7 @@ void_result account_create_evaluator::do_evaluate( const account_create_operatio
evaluate_special_authority( d, *op.extensions.value.active_special_authority ); evaluate_special_authority( d, *op.extensions.value.active_special_authority );
if( op.extensions.value.buyback_options.valid() ) if( op.extensions.value.buyback_options.valid() )
evaluate_buyback_account_options( d, *op.extensions.value.buyback_options ); evaluate_buyback_account_options( d, *op.extensions.value.buyback_options );
verify_account_votes( d, op.options );
FC_ASSERT( op.options.num_witness <= chain_params.maximum_witness_count,
"Voted for more witnesses than currently allowed (${c})", ("c", chain_params.maximum_witness_count) );
FC_ASSERT( op.options.num_committee <= chain_params.maximum_committee_count,
"Voted for more committee members than currently allowed (${c})", ("c", chain_params.maximum_committee_count) );
uint32_t max_vote_id = global_props.next_available_vote_id;
for( auto id : op.options.votes )
{
FC_ASSERT( id < max_vote_id );
}
auto& acnt_indx = d.get_index_type<account_index>(); auto& acnt_indx = d.get_index_type<account_index>();
if( op.name.size() ) if( op.name.size() )
@ -214,8 +223,6 @@ void_result account_update_evaluator::do_evaluate( const account_update_operatio
FC_ASSERT( !o.extensions.value.active_special_authority.valid() ); FC_ASSERT( !o.extensions.value.active_special_authority.valid() );
} }
const auto& chain_params = d.get_global_properties().parameters;
try try
{ {
if( o.owner ) verify_authority_accounts( d, *o.owner ); if( o.owner ) verify_authority_accounts( d, *o.owner );
@ -231,16 +238,8 @@ void_result account_update_evaluator::do_evaluate( const account_update_operatio
acnt = &o.account(d); acnt = &o.account(d);
if( o.new_options ) if( o.new_options.valid() )
{ verify_account_votes( d, *o.new_options );
FC_ASSERT( o.new_options->num_witness <= chain_params.maximum_witness_count );
FC_ASSERT( o.new_options->num_committee <= chain_params.maximum_committee_count );
uint32_t max_vote_id = d.get_global_properties().next_available_vote_id;
for( auto id : o.new_options->votes )
{
FC_ASSERT( id < max_vote_id );
}
}
return void_result(); return void_result();
} FC_CAPTURE_AND_RETHROW( (o) ) } } FC_CAPTURE_AND_RETHROW( (o) ) }