Rename setup_policy::full_except_do_not_disable_deferred_trx to setup_policy::full_prior_to_disable_deferred_trx, validating_tester_no_disable_deferred_trx to validating_tester_no_disable_deferred_trx so they better reflect what they are

Author: linh2931

libraries/testing/include/eosio/testing/tester.hpp

@@ -67,7 +67,7 @@ namespace eosio::testing {
       preactivate_feature_only,
       preactivate_feature_and_new_bios,
       old_wasm_parser,
-      full_except_do_not_disable_deferred_trx,
+      full_prior_to_disable_deferred_trx,
       full_except_do_not_transition_to_savanna,
       full
    };
@@ -475,7 +475,7 @@ namespace eosio::testing {
          void preactivate_protocol_features(const vector<digest_type>& feature_digests);
          void preactivate_builtin_protocol_features(const std::vector<builtin_protocol_feature_t>& features);
          void preactivate_all_builtin_protocol_features();
-         void preactivate_all_but_disable_deferred_trx();
+         void preactivate_all_prior_to_disable_deferred_trx();
          void preactivate_savanna_protocol_features();
 
          static genesis_state default_genesis() {
@@ -731,7 +731,7 @@ namespace eosio::testing {
 
    class tester_no_disable_deferred_trx : public tester {
    public:
-      tester_no_disable_deferred_trx(): tester(setup_policy::full_except_do_not_disable_deferred_trx) {
+      tester_no_disable_deferred_trx(): tester(setup_policy::full_prior_to_disable_deferred_trx) {
       }
    };
 
@@ -861,7 +861,7 @@ namespace eosio::testing {
 
    class validating_tester_no_disable_deferred_trx : public validating_tester {
    public:
-      validating_tester_no_disable_deferred_trx(): validating_tester({}, nullptr, setup_policy::full_except_do_not_disable_deferred_trx) {
+      validating_tester_no_disable_deferred_trx(): validating_tester({}, nullptr, setup_policy::full_prior_to_disable_deferred_trx) {
       }
    };
 

libraries/testing/tester.cpp

@@ -272,13 +272,13 @@ namespace eosio::testing {
             break;
          }
          case setup_policy::full:
-         case setup_policy::full_except_do_not_disable_deferred_trx:
+         case setup_policy::full_prior_to_disable_deferred_trx:
          case setup_policy::full_except_do_not_transition_to_savanna: {
             schedule_preactivate_protocol_feature();
             produce_block();
             set_before_producer_authority_bios_contract();
-            if( policy == setup_policy::full_except_do_not_disable_deferred_trx ) {
-               preactivate_all_but_disable_deferred_trx();
+            if( policy == setup_policy::full_prior_to_disable_deferred_trx ) {
+               preactivate_all_prior_to_disable_deferred_trx();
             } else {
                preactivate_all_builtin_protocol_features();
             }
@@ -288,7 +288,7 @@ namespace eosio::testing {
             }
 
             // Do not transition to Savanna under full_except_do_not_transition_to_savanna or
-            // full_except_do_not_disable_deferred_trx
+            // full_prior_to_disable_deferred_trx
             if( policy == setup_policy::full ) {
                // BLS voting is slow. Use only 1 finalizer for default testser.
                finalizer_keys fin_keys(*this, 1u /* num_keys */, 1u /* finset_size */);
@@ -1475,7 +1475,7 @@ namespace eosio::testing {
       preactivate_builtin_protocol_features( get_all_builtin_protocol_features() );
    }
 
-   void base_tester::preactivate_all_but_disable_deferred_trx() {
+   void base_tester::preactivate_all_prior_to_disable_deferred_trx() {
       std::vector<builtin_protocol_feature_t> builtins;
       for( const auto& f : get_all_builtin_protocol_features() ) {
          // Before deferred trxs feature is fully disabled, existing tests involving

unittests/api_tests.cpp

@@ -1083,8 +1083,8 @@ BOOST_AUTO_TEST_CASE_TEMPLATE( inline_action_objective_limit, T, testers ) { try
 
 BOOST_AUTO_TEST_CASE(deferred_inline_action_limit) { try {
    const uint32_t _4k = 4 * 1024;
-   tester chain(setup_policy::full_except_do_not_disable_deferred_trx, db_read_mode::HEAD, {_4k + 100});
-   tester chain2(setup_policy::full_except_do_not_disable_deferred_trx, db_read_mode::HEAD, {_4k + 100});
+   tester chain(setup_policy::full_prior_to_disable_deferred_trx, db_read_mode::HEAD, {_4k + 100});
+   tester chain2(setup_policy::full_prior_to_disable_deferred_trx, db_read_mode::HEAD, {_4k + 100});
    signed_block_ptr block;
    for (int n=0; n < 2; ++n) {
       block = chain.produce_block();

unittests/currency_tests.cpp

@@ -97,7 +97,7 @@ using currency_testers = boost::mpl::list<currency_tester<legacy_validating_test
 
 class pre_disable_deferred_trx_currency_tester : public currency_tester<legacy_validating_tester> {
    public:
-      pre_disable_deferred_trx_currency_tester() : currency_tester(setup_policy::full_except_do_not_disable_deferred_trx) {}
+      pre_disable_deferred_trx_currency_tester() : currency_tester(setup_policy::full_prior_to_disable_deferred_trx) {}
 };
 
 template <typename T>