Merge branch 'main' into GH-169-eosio-system-tests

AntelopeIO · May 27, 2024 · 56ea6c9 · 56ea6c9
2 parents 87fc5e0 + 2b86741
commit 56ea6c9
Show file tree

Hide file tree

Showing 4 changed files with 391 additions and 417 deletions.
diff --git a/unittests/bootseq_tests.cpp b/unittests/bootseq_tests.cpp
diff --git a/unittests/deep-mind/deep-mind.log b/unittests/deep-mind/deep-mind.log
diff --git a/unittests/deep_mind_tests.cpp b/unittests/deep_mind_tests.cpp
@@ -47,9 +47,10 @@ struct deep_mind_log_fixture
    }
 };
 
-struct deep_mind_tester : deep_mind_log_fixture, validating_tester
+// We only test deep-mind in Savanna
+struct deep_mind_tester : deep_mind_log_fixture, savanna_validating_tester
 {
-   deep_mind_tester() : validating_tester({}, &deep_mind_logger, setup_policy::full) {}
+   deep_mind_tester() : savanna_validating_tester({}, &deep_mind_logger, setup_policy::full) {}
 };
 
 namespace {
@@ -86,18 +87,23 @@ BOOST_AUTO_TEST_SUITE(deep_mind_tests)
 
 BOOST_FIXTURE_TEST_CASE(deep_mind, deep_mind_tester)
 {
-   produce_block();
-
+   // We have already transitioned into Savanna
    create_account( "alice"_n );
-
    push_action(config::system_account_name, "updateauth"_n, "alice"_n, fc::mutable_variant_object()
                ("account", "alice")
                ("permission", "test1")
                ("parent", "active")
                ("auth", authority{{"eosio"_n, "active"_n}}));
-
    produce_block();
 
+   // Update proposer schedule
+   vector<account_name> producers = { "bob"_n, "carol"_n, "charlie"_n };
+   create_accounts(producers);
+   set_producers(producers);
+
+   // Produce 2 rounds to make the schedule active
+   produce_blocks(config::producer_repetitions * 2);
+
    bool save_log = [](){
       auto argc = boost::unit_test::framework::master_test_suite().argc;
       auto argv = boost::unit_test::framework::master_test_suite().argv;