Merge pull request #2765 from bitshares/hardfork

Merge hardfork branch into release branch
bitshares · Jul 3, 2023 · e82f080 · e82f080
2 parents 962be19 + 10468b2
commit e82f080
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tests/tests/bsrm_indvd_settlement_tests.cpp b/tests/tests/bsrm_indvd_settlement_tests.cpp
@@ -974,8 +974,8 @@ BOOST_AUTO_TEST_CASE( individual_settlement_to_fund_and_no_feed )
       BOOST_CHECK_THROW( force_settle( seller, asset(100001,mpa_id) ), fc::exception );
 
       // Advance to core-2587 hard fork
-      generate_blocks(HARDFORK_CORE_2587_TIME - mi);
-      generate_blocks(db.get_dynamic_global_properties().next_maintenance_time);
+      generate_blocks( HARDFORK_CORE_2587_TIME );
+      generate_block();
       set_expiration( db, trx );
 
       // able to settle more than the fund