STAT-81 (GH-607) Fixed bugs from previous commits.

libraries/chain/chain_controller.cpp

@@ -1022,9 +1022,9 @@ void chain_controller::apply_message(apply_context& context)
     if (recipient.code.size()) {
        //idump((context.code)(context.msg.type));
        const uint32_t execution_time =
-          _skip_flags | received_block
+          _skip_flags & received_block
              ? _rcvd_block_txn_execution_time
-             : _skip_flags | created_block
+             : _skip_flags & created_block
                ? _create_block_txn_execution_time
                : _txn_execution_time;
        const bool is_received_block = _skip_flags & received_block;

tests/common/macro_support.hpp

@@ -25,12 +25,11 @@
    native_contract::native_contract_chain_initializer name ## _initializer(genesis_state()); \
    testing_blockchain name(name ## _db, name ## _fdb, name ## _log, name ## _initializer, *this); \
    BOOST_TEST_CHECKPOINT("Created blockchain " << #name);
-#define MKCHAIN5(name, transaction_execution_time_sec, receive_block_execution_time_sec, create_block_execution_time_sec, rate_limit) \
+#define MKCHAIN5(name, transaction_execution_time_sec, receive_block_execution_time_sec, create_block_execution_time_sec, rate_limits) \
    chainbase::database name ## _db(get_temp_dir(), chainbase::database::read_write, TEST_DB_SIZE); \
    block_log name ## _log(get_temp_dir() / "blocklog"); \
    fork_database name ## _fdb; \
    native_contract::native_contract_chain_initializer name ## _initializer(genesis_state()); \
-   chain_controller::txn_msg_limits rate_limits; \
    testing_blockchain name(name ## _db, name ## _fdb, name ## _log, name ## _initializer, *this, transaction_execution_time_sec, receive_block_execution_time_sec, create_block_execution_time_sec, rate_limits); \
    BOOST_TEST_CHECKPOINT("Created blockchain " << #name);
 #define MKCHAINS_MACRO(x, y, name) Make_Blockchain(name)