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

Fix startup sequence

Browse source
This commit is contained in:
serkixenos 2022-09-05 02:16:03 +02:00
parent c967504235
commit 23a7a8e80a
4 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/chain/db_init.cpp
View file

@ -1115,7 +1115,6 @@ void database::init_genesis(const genesis_state_type& genesis_state)
_sso.scheduler = son_scheduler(); _sso.scheduler = son_scheduler();
_sso.scheduler._min_token_count = std::max(int(init_bitcoin_sons.size()) / 2, 1); _sso.scheduler._min_token_count = std::max(int(init_bitcoin_sons.size()) / 2, 1);
//_sso.scheduler.update(init_bitcoin_sons);
_sso.last_scheduling_block = 0; _sso.last_scheduling_block = 0;
@ -1137,7 +1136,6 @@ void database::init_genesis(const genesis_state_type& genesis_state)
_sso.scheduler = son_scheduler(); _sso.scheduler = son_scheduler();
_sso.scheduler._min_token_count = std::max(int(init_ethereum_sons.size()) / 2, 1); _sso.scheduler._min_token_count = std::max(int(init_ethereum_sons.size()) / 2, 1);
//_sso.scheduler.update(init_ethereum_sons);
_sso.last_scheduling_block = 0; _sso.last_scheduling_block = 0;
@ -1159,7 +1157,6 @@ void database::init_genesis(const genesis_state_type& genesis_state)
_sso.scheduler = son_scheduler(); _sso.scheduler = son_scheduler();
_sso.scheduler._min_token_count = std::max(int(init_hive_sons.size()) / 2, 1); _sso.scheduler._min_token_count = std::max(int(init_hive_sons.size()) / 2, 1);
//_sso.scheduler.update(init_hive_sons);
_sso.last_scheduling_block = 0; _sso.last_scheduling_block = 0;

2
libraries/chain/db_maint.cpp
View file

@ -721,7 +721,9 @@ void database::update_active_sons()
assert( _son_count_histogram_buffer.size() > 0 ); assert( _son_count_histogram_buffer.size() > 0 );
for( const auto& son_count_histogram_buffer : _son_count_histogram_buffer ){ for( const auto& son_count_histogram_buffer : _son_count_histogram_buffer ){
#ifndef NDEBUG
assert( son_count_histogram_buffer.second.size() > 0 ); assert( son_count_histogram_buffer.second.size() > 0 );
#endif
} }
const flat_map<sidechain_type, share_type> stake_target = [this]{ const flat_map<sidechain_type, share_type> stake_target = [this]{

6
libraries/chain/db_witness_schedule.cpp
View file

@ -77,9 +77,9 @@ witness_id_type database::get_scheduled_witness( uint32_t slot_num )const
unsigned_int database::get_son_schedule_id( sidechain_type type )const unsigned_int database::get_son_schedule_id( sidechain_type type )const
{ {
static const map<sidechain_type, unsigned_int> schedule_map = { static const map<sidechain_type, unsigned_int> schedule_map = {
{ sidechain_type::hive, 0 }, { sidechain_type::bitcoin, 0 },
{ sidechain_type::bitcoin, 1 }, { sidechain_type::ethereum, 1 },
{ sidechain_type::ethereum, 2 } { sidechain_type::hive, 2 }
}; };
return schedule_map.at(type); return schedule_map.at(type);

1
libraries/plugins/peerplays_sidechain/sidechain_net_handler_ethereum.cpp
View file

@ -450,7 +450,6 @@ void sidechain_net_handler_ethereum::process_primary_wallet() {
} }
void sidechain_net_handler_ethereum::process_sidechain_addresses() { void sidechain_net_handler_ethereum::process_sidechain_addresses() {
int temp = 0;
} }
bool sidechain_net_handler_ethereum::process_deposit(const son_wallet_deposit_object &swdo) { bool sidechain_net_handler_ethereum::process_deposit(const son_wallet_deposit_object &swdo) {