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

removing hard fork

Browse source
This commit is contained in:
Daniel Larimer 2015-10-05 08:55:32 -04:00
parent bb0ea77e80
commit 1e1617633c
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/chain/db_maint.cpp
View file

@ -132,9 +132,6 @@ void database::update_active_witnesses()
assert( _witness_count_histogram_buffer.size() > 0 );
share_type stake_target = (_total_voting_stake-_witness_count_histogram_buffer[0]) / 2;
#warning HARDFORK - remove this code after Oct 2 testnet is over.
if( head_block_time() < fc::time_point_sec(1443900665) )
stake_target = _total_voting_stake/2;
/// accounts that vote for 0 or 1 witness do not get to express an opinion on
/// the number of witnesses to have (they abstain and are non-voting accounts)
@ -217,11 +214,6 @@ void database::update_active_committee_members()
assert( _committee_count_histogram_buffer.size() > 0 );
share_type stake_target = (_total_voting_stake-_witness_count_histogram_buffer[0]) / 2;
#warning HARDFORK - remove this code after Oct 2 testnet is over.
if( head_block_time() < fc::time_point_sec(1443900665) )
stake_target = _total_voting_stake/2;
/// accounts that vote for 0 or 1 witness do not get to express an opinion on
/// the number of witnesses to have (they abstain and are non-voting accounts)
uint64_t stake_tally = 0; // _committee_count_histogram_buffer[0];