Merge remote-tracking branch 'origin/feature/dpos-pbft-bos-upgrade-sl…

…im' into feature/dpos-pbft-bos-upgrade-slim

# Conflicts:
#	libraries/chain/controller.cpp
#	libraries/chain/include/eosio/chain/pbft_database.hpp
#	libraries/chain/pbft_database.cpp
#	plugins/net_plugin/include/eosio/net_plugin/protocol.hpp
#	plugins/net_plugin/net_plugin.cpp

libraries/chain/controller.cpp

@@ -2538,7 +2538,6 @@ block_id_type controller::get_pbft_prepared() const {
     return block_id_type{};
 }
 
-
 block_id_type controller::get_pbft_my_prepare() const {
    if (my->my_prepare) return my->my_prepare->id;
    return block_id_type{};
@@ -2670,7 +2669,6 @@ producer_schedule_type controller::initial_schedule() const {
    return producer_schedule_type{ 0, {{eosio::chain::config::system_account_name, my->conf.genesis.initial_key}} };
 }
 
-
 bool controller::is_known_unexpired_transaction( const transaction_id_type& id) const {
    return db().find<transaction_object, by_trx_id>(id);
 }

plugins/net_plugin/net_plugin.cpp

@@ -1163,7 +1163,7 @@ namespace eosio {
                 break;
             }
         }
-        if (drop_pbft_count) wlog("dropped ${n} outdated pbft messages", ("n",drop_pbft_count));
+
         //drop timeout messages in mem, init send buffer only when actual send happens
         //copied from a previous version of  connection::enqueue
         connection_wptr weak_this = shared_from_this();
@@ -2971,11 +2971,7 @@ namespace eosio {
 
     template<typename M>
     bool net_plugin_impl::is_pbft_msg_outdated(M const & msg) {
-        if (time_point_sec(time_point::now()) > time_point_sec(msg.timestamp) + pbft_message_TTL) {
-            wlog("received a outdated pbft message ${m}", ("m", msg));
-            return true;
-        }
-        return false;
+        return (time_point_sec(time_point::now()) > time_point_sec(msg.timestamp) + pbft_message_TTL);
     }
 
     template<typename M>