Add new light_validation_mode method since skip_auth_check requires p…

…ending
EOSIO · Feb 25, 2020 · 7ad5cbd · 7ad5cbd
1 parent 7169e9a
commit 7ad5cbd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
@@ -3025,12 +3025,14 @@ bool controller::light_validation_allowed(bool replay_opts_disabled_by_policy) c
    const bool consider_skipping_on_replay = (pb_status == block_status::irreversible || pb_status == block_status::validated) && !replay_opts_disabled_by_policy;
 
    // OR in a signed block and in light validation mode
-   const bool consider_skipping_on_validate = (pb_status == block_status::complete &&
-         (my->conf.block_validation_mode == validation_mode::LIGHT || my->trusted_producer_light_validation));
+   const bool consider_skipping_on_validate = pb_status == block_status::complete && light_validation_mode();
 
    return consider_skipping_on_replay || consider_skipping_on_validate;
 }
 
+bool controller::light_validation_mode() const {
+   return my->conf.block_validation_mode == validation_mode::LIGHT || my->trusted_producer_light_validation;
+}
 
 bool controller::skip_auth_check() const {
    return light_validation_allowed(my->conf.force_all_checks);

diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
@@ -273,6 +273,7 @@ namespace eosio { namespace chain {
          int64_t set_proposed_producers( vector<producer_authority> producers );
 
          bool light_validation_allowed(bool replay_opts_disabled_by_policy) const;
+         bool light_validation_mode() const;
          bool skip_auth_check()const;
          bool skip_db_sessions( )const;
          bool skip_db_sessions( block_status bs )const;

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
@@ -3087,7 +3087,7 @@ namespace eosio {
    void net_plugin_impl::on_accepted_block(const block_state_ptr& block) {
       update_chain_info();
       controller& cc = chain_plug->chain();
-      if( !cc.skip_auth_check() ) {
+      if( !cc.light_validation_mode() ) {
          dispatcher->strand.post( [this, block]() {
             fc_dlog( logger, "signaled accepted_block, blk num = ${num}, id = ${id}", ("num", block->block_num)("id", block->id) );
             dispatcher->bcast_block( block );
@@ -3099,7 +3099,7 @@ namespace eosio {
    void net_plugin_impl::on_accepted_block_header(const block_state_ptr& block) {
       update_chain_info();
       controller& cc = chain_plug->chain();
-      if( cc.skip_auth_check() ) {
+      if( cc.light_validation_mode() ) {
          dispatcher->strand.post( [this, block]() {
             fc_dlog( logger, "signaled accepted_block_header, blk num = ${num}, id = ${id}", ("num", block->block_num)("id", block->id) );
             dispatcher->bcast_block( block );