From 23a7a8e80ad1c4371bf55fb6ff5ea7391f28ddea Mon Sep 17 00:00:00 2001 From: serkixenos Date: Mon, 5 Sep 2022 02:16:03 +0200 Subject: [PATCH] Fix startup sequence --- libraries/chain/db_init.cpp | 3 --- libraries/chain/db_maint.cpp | 2 ++ libraries/chain/db_witness_schedule.cpp | 6 +++--- .../peerplays_sidechain/sidechain_net_handler_ethereum.cpp | 1 - 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index 67790d04..e9f3b9f5 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -1115,7 +1115,6 @@ void database::init_genesis(const genesis_state_type& genesis_state) _sso.scheduler = son_scheduler(); _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; @@ -1137,7 +1136,6 @@ void database::init_genesis(const genesis_state_type& genesis_state) _sso.scheduler = son_scheduler(); _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; @@ -1159,7 +1157,6 @@ void database::init_genesis(const genesis_state_type& genesis_state) _sso.scheduler = son_scheduler(); _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; diff --git a/libraries/chain/db_maint.cpp b/libraries/chain/db_maint.cpp index 9a8ed58a..7474edac 100644 --- a/libraries/chain/db_maint.cpp +++ b/libraries/chain/db_maint.cpp @@ -721,7 +721,9 @@ void database::update_active_sons() assert( _son_count_histogram_buffer.size() > 0 ); for( const auto& son_count_histogram_buffer : _son_count_histogram_buffer ){ +#ifndef NDEBUG assert( son_count_histogram_buffer.second.size() > 0 ); +#endif } const flat_map stake_target = [this]{ diff --git a/libraries/chain/db_witness_schedule.cpp b/libraries/chain/db_witness_schedule.cpp index 7cb1c89a..b4c4bb6a 100644 --- a/libraries/chain/db_witness_schedule.cpp +++ b/libraries/chain/db_witness_schedule.cpp @@ -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 { static const map schedule_map = { - { sidechain_type::hive, 0 }, - { sidechain_type::bitcoin, 1 }, - { sidechain_type::ethereum, 2 } + { sidechain_type::bitcoin, 0 }, + { sidechain_type::ethereum, 1 }, + { sidechain_type::hive, 2 } }; return schedule_map.at(type); diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_ethereum.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_ethereum.cpp index 31d1fa8a..066c9dd8 100644 --- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_ethereum.cpp +++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_ethereum.cpp @@ -450,7 +450,6 @@ void sidechain_net_handler_ethereum::process_primary_wallet() { } void sidechain_net_handler_ethereum::process_sidechain_addresses() { - int temp = 0; } bool sidechain_net_handler_ethereum::process_deposit(const son_wallet_deposit_object &swdo) {