Merge pull request EOSIO#4158 from wanderingbort/feature/only-thow-un…

…expected-fails only thow unexpected fails in apply_block
tmuskal · Jun 16, 2018 · c9b7a24 · c9b7a24
2 parents 013c282 + fefe88f
commit c9b7a24
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
@@ -804,7 +804,9 @@ struct controller_impl {
                EOS_ASSERT( false, block_validate_exception, "encountered unexpected receipt type" );
             }
 
-            if( trace && trace->except ) {
+            bool transaction_failed =  trace && trace->except;
+            bool transaction_can_fail = receipt.status == transaction_receipt_header::hard_fail && receipt.trx.contains<transaction_id_type>();
+            if( transaction_failed && !transaction_can_fail) {
                edump((*trace));
                throw *trace->except;
             }