add whitelist/blacklist exceptions to failure_is_subjective #3814

libraries/chain/controller.cpp

@@ -492,10 +492,14 @@ struct controller_impl {
 
    bool failure_is_subjective( const fc::exception& e ) {
       auto code = e.code();
-      return (code == block_net_usage_exceeded::code_value) ||
-             (code == block_cpu_usage_exceeded::code_value) ||
-             (code == deadline_exception::code_value)       ||
-             (code == leeway_deadline_exception::code_value);
+      return    (code == block_net_usage_exceeded::code_value)
+             || (code == block_cpu_usage_exceeded::code_value)
+             || (code == deadline_exception::code_value)
+             || (code == leeway_deadline_exception::code_value)
+             || (code == actor_whitelist_exception::code_value)
+             || (code == actor_blacklist_exception::code_value)
+             || (code == contract_whitelist_exception::code_value)
+             || (code == contract_blacklist_exception::code_value);
    }
 
    transaction_trace_ptr push_scheduled_transaction( const transaction_id_type& trxid, fc::time_point deadline, uint32_t billed_cpu_time_us ) {

unittests/whitelist_blacklist_tests.cpp

@@ -347,15 +347,15 @@ BOOST_AUTO_TEST_CASE( deferred_blacklist_failure ) { try {
       ( "payload", 10 )
    );
 
-   tester1.chain->produce_blocks(2);
+   BOOST_CHECK_EXCEPTION( tester1.chain->produce_blocks(), fc::exception,
+                          fc_exception_message_is("account 'charlie' is on the contract blacklist")
+                        );
+   tester1.chain->produce_blocks(2, true); // Produce 2 empty blocks (other than onblock of course).
 
-   // Comment out to trigger bug
-   /*
    while( tester2.chain->control->head_block_num() < tester1.chain->control->head_block_num() ) {
       auto b = tester1.chain->control->fetch_block_by_number( tester2.chain->control->head_block_num()+1 );
       tester2.chain->push_block( b );
    }
-   */
 } FC_LOG_AND_RETHROW() }
 
 BOOST_AUTO_TEST_SUITE_END()