Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge hardfork branch into release branch #2765

Merged
merged 2 commits into from
Jul 3, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/tests/bsrm_indvd_settlement_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down