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

Fix indentation #533

Browse source
This commit is contained in:
theoreticalbts 2016-01-22 16:14:50 -05:00
parent a1ee326b55
commit ef68375fab
1 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
libraries/chain/db_maint.cpp
View file

@ -189,30 +189,30 @@ void database::update_active_witnesses()
{ {
if( head_block_time() < HARDFORK_533_TIME ) if( head_block_time() < HARDFORK_533_TIME )
{ {
uint64_t total_votes = 0; uint64_t total_votes = 0;
map<account_id_type, uint64_t> weights; map<account_id_type, uint64_t> weights;
a.active.weight_threshold = 0; a.active.weight_threshold = 0;
a.active.clear(); a.active.clear();
for( const witness_object& wit : wits ) for( const witness_object& wit : wits )
{ {
weights.emplace(wit.witness_account, _vote_tally_buffer[wit.vote_id]); weights.emplace(wit.witness_account, _vote_tally_buffer[wit.vote_id]);
total_votes += _vote_tally_buffer[wit.vote_id]; total_votes += _vote_tally_buffer[wit.vote_id];
} }
// total_votes is 64 bits. Subtract the number of leading low bits from 64 to get the number of useful bits, // total_votes is 64 bits. Subtract the number of leading low bits from 64 to get the number of useful bits,
// then I want to keep the most significant 16 bits of what's left. // then I want to keep the most significant 16 bits of what's left.
int8_t bits_to_drop = std::max(int(boost::multiprecision::detail::find_msb(total_votes)) - 15, 0); int8_t bits_to_drop = std::max(int(boost::multiprecision::detail::find_msb(total_votes)) - 15, 0);
for( const auto& weight : weights ) for( const auto& weight : weights )
{ {
// Ensure that everyone has at least one vote. Zero weights aren't allowed. // Ensure that everyone has at least one vote. Zero weights aren't allowed.
uint16_t votes = std::max((weight.second >> bits_to_drop), uint64_t(1) ); uint16_t votes = std::max((weight.second >> bits_to_drop), uint64_t(1) );
a.active.account_auths[weight.first] += votes; a.active.account_auths[weight.first] += votes;
a.active.weight_threshold += votes; a.active.weight_threshold += votes;
} }
a.active.weight_threshold /= 2; a.active.weight_threshold /= 2;
a.active.weight_threshold += 1; a.active.weight_threshold += 1;
} }
else else
{ {
@ -273,30 +273,30 @@ void database::update_active_committee_members()
{ {
if( head_block_time() < HARDFORK_533_TIME ) if( head_block_time() < HARDFORK_533_TIME )
{ {
uint64_t total_votes = 0; uint64_t total_votes = 0;
map<account_id_type, uint64_t> weights; map<account_id_type, uint64_t> weights;
a.active.weight_threshold = 0; a.active.weight_threshold = 0;
a.active.clear(); a.active.clear();
for( const committee_member_object& del : committee_members ) for( const committee_member_object& del : committee_members )
{ {
weights.emplace(del.committee_member_account, _vote_tally_buffer[del.vote_id]); weights.emplace(del.committee_member_account, _vote_tally_buffer[del.vote_id]);
total_votes += _vote_tally_buffer[del.vote_id]; total_votes += _vote_tally_buffer[del.vote_id];
} }
// total_votes is 64 bits. Subtract the number of leading low bits from 64 to get the number of useful bits, // total_votes is 64 bits. Subtract the number of leading low bits from 64 to get the number of useful bits,
// then I want to keep the most significant 16 bits of what's left. // then I want to keep the most significant 16 bits of what's left.
int8_t bits_to_drop = std::max(int(boost::multiprecision::detail::find_msb(total_votes)) - 15, 0); int8_t bits_to_drop = std::max(int(boost::multiprecision::detail::find_msb(total_votes)) - 15, 0);
for( const auto& weight : weights ) for( const auto& weight : weights )
{ {
// Ensure that everyone has at least one vote. Zero weights aren't allowed. // Ensure that everyone has at least one vote. Zero weights aren't allowed.
uint16_t votes = std::max((weight.second >> bits_to_drop), uint64_t(1) ); uint16_t votes = std::max((weight.second >> bits_to_drop), uint64_t(1) );
a.active.account_auths[weight.first] += votes; a.active.account_auths[weight.first] += votes;
a.active.weight_threshold += votes; a.active.weight_threshold += votes;
} }
a.active.weight_threshold /= 2; a.active.weight_threshold /= 2;
a.active.weight_threshold += 1; a.active.weight_threshold += 1;
} }
else else
{ {