Merge pull request #7612 from EOSIO/tester-explicit-billing-fix-1.7

use explicit billing for unapplied and deferred transactions in tester - v1.7.x
EOSIO · Jul 9, 2019 · f31181c · f31181c
2 parents b666c93 + 70725ad
commit f31181c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
@@ -166,7 +166,7 @@ namespace eosio { namespace testing {
       if( !skip_pending_trxs ) {
          unapplied_transactions_type unapplied_trxs = control->get_unapplied_transactions(); // make copy of map
          for (const auto& entry : unapplied_trxs ) {
-            auto trace = control->push_transaction(entry.second, fc::time_point::maximum());
+            auto trace = control->push_transaction(entry.second, fc::time_point::maximum(), DEFAULT_BILLED_CPU_TIME_US );
             if(trace->except) {
                trace->except->dynamic_rethrow_exception();
             }
@@ -175,7 +175,7 @@ namespace eosio { namespace testing {
          vector<transaction_id_type> scheduled_trxs;
          while( (scheduled_trxs = get_scheduled_transactions() ).size() > 0 ) {
             for (const auto& trx : scheduled_trxs ) {
-               auto trace = control->push_scheduled_transaction(trx, fc::time_point::maximum());
+               auto trace = control->push_scheduled_transaction(trx, fc::time_point::maximum(), DEFAULT_BILLED_CPU_TIME_US);
                if(trace->except) {
                   trace->except->dynamic_rethrow_exception();
                }