C9S/coopos
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

refactor preactivate_builtin_protocol_features and revert back to original full policy for deep-mind test and update deep-mind log

Browse Source
This commit is contained in:
Lin Huang
2023-10-03 15:12:04 -04:00
parent 7b3a7c580e
commit cf15dd85fb
4 changed files with 120 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/testing/include/eosio/testing/tester.hpp
-1
View File
@@ -388,7 +388,6 @@ namespace eosio { namespace testing {
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_builtin_protocol_features_common(const std::vector<builtin_protocol_feature_t>& ordered_builtins);
static genesis_state default_genesis() {
genesis_state genesis;
libraries/testing/tester.cpp
+8 -24
View File
@@ -1189,21 +1189,7 @@ namespace eosio { namespace testing {
}
}
void base_tester::preactivate_builtin_protocol_features(const std::vector<builtin_protocol_feature_t>& builtin_features) {
const auto& pfs = control->get_protocol_feature_manager().get_protocol_feature_set();
// This behavior is disabled by configurable_wasm_limits
std::vector<digest_type> features;
for(builtin_protocol_feature_t feature : builtin_features ) {
if( auto digest = pfs.get_builtin_digest( feature ) ) {
features.push_back( *digest );
}
}
preactivate_protocol_features(features);
}
void base_tester::preactivate_all_builtin_protocol_features_common(const std::vector<builtin_protocol_feature_t>& ordered_builtins) {
void base_tester::preactivate_builtin_protocol_features(const std::vector<builtin_protocol_feature_t>& builtins) {
const auto& pfm = control->get_protocol_feature_manager();
const auto& pfs = pfm.get_protocol_feature_set();
const auto current_block_num = control->head_block_num() + (control->is_building_block() ? 1 : 0);
@@ -1231,7 +1217,7 @@ namespace eosio { namespace testing {
preactivations.emplace_back( feature_digest );
};
for( const auto& f : ordered_builtins ) {
for( const auto& f : builtins ) {
auto digest = pfs.get_builtin_digest( f);
if( !digest ) continue;
add_digests( *digest );
@@ -1241,17 +1227,16 @@ namespace eosio { namespace testing {
}
void base_tester::preactivate_all_builtin_protocol_features() {
std::vector<builtin_protocol_feature_t> ordered_builtins;
std::vector<builtin_protocol_feature_t> builtins;
for( const auto& f : builtin_protocol_feature_codenames ) {
ordered_builtins.push_back( f.first );
builtins.push_back( f.first );
}
std::sort( ordered_builtins.begin(), ordered_builtins.end() );
preactivate_all_builtin_protocol_features_common( ordered_builtins );
preactivate_builtin_protocol_features( builtins );
}
void base_tester::preactivate_all_but_disable_deferred_trx() {
std::vector<builtin_protocol_feature_t> ordered_builtins;
std::vector<builtin_protocol_feature_t> builtins;
for( const auto& f : builtin_protocol_feature_codenames ) {
// Before deferred trxs feature is fully disabled, existing tests involving
// deferred trxs need to be exercised to make sure existing behaviors are
@@ -1262,11 +1247,10 @@ namespace eosio { namespace testing {
continue;
}
ordered_builtins.push_back( f.first );
builtins.push_back( f.first );
}
std::sort( ordered_builtins.begin(), ordered_builtins.end() );
preactivate_all_builtin_protocol_features_common( ordered_builtins );
preactivate_builtin_protocol_features( builtins );
}
tester::tester(const std::function<void(controller&)>& control_setup, setup_policy policy, db_read_mode read_mode) {
unittests/deep-mind/deep-mind.log
+111 -101
View File
File diff suppressed because one or more lines are too long
unittests/deep_mind_tests.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ struct deep_mind_log_fixture
struct deep_mind_tester : deep_mind_log_fixture, validating_tester
{
deep_mind_tester() : validating_tester({}, &deep_mind_logger, setup_policy::full_except_do_not_disable_deferred_trx) {}
deep_mind_tester() : validating_tester({}, &deep_mind_logger, setup_policy::full) {}
};
namespace {