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

remove special case logic for soft-fork 3 activation #16819

Merged
merged 1 commit into from
Nov 21, 2023

Conversation

arvidn
Copy link
Contributor

@arvidn arvidn commented Nov 13, 2023

Purpose:

Apply the new rules to the entire chain, to simplify our code.

Current Behavior:

Softfork-3 activates at height 4510000

New Behavior:

Softfork-3 activates at height 0

Test

here

Main currently runs 6391 tests, with this patch we run 5227 tests (saving 1164 tests)

@arvidn arvidn added Changed Required label for PR that categorizes merge commit message as "Changed" for changelog Cleanup Code cleanup labels Nov 13, 2023
@arvidn arvidn closed this Nov 13, 2023
@arvidn arvidn reopened this Nov 13, 2023
Copy link
Contributor

File Coverage Missing Lines
tests/core/mempool/test_mempool.py 0.0% lines 2593
Total Missing Coverage
3 lines Unknown 66%

@arvidn
Copy link
Contributor Author

arvidn commented Nov 15, 2023

the missing test coverage is from a benchmark, which we don't instrument

@arvidn arvidn requested a review from aqk November 16, 2023 23:24
@arvidn arvidn marked this pull request as ready for review November 16, 2023 23:24
@arvidn arvidn requested a review from a team as a code owner November 16, 2023 23:24
@aqk
Copy link
Contributor

aqk commented Nov 17, 2023

What do you think about leaving the enum entry for SOFT_FORK3 at this line?

https://github.com/Chia-Network/chia-blockchain/pull/16819/files#diff-e52e4ddd58b7ef887ab03c04116e676f6280b824ab7469d5d3080e5cba4f2128L156

I know it's in git history; I just wonder if it's worth keeping a list of all the soft-forks somewhere visible.

Ah, I see. There's really no need.

@aqk
Copy link
Contributor

aqk commented Nov 17, 2023

I wish I could reply to comments on this main page, since we're forced to use comments here for comments that won't block the PR.

@arvidn arvidn requested a review from wjblanke November 17, 2023 22:26
@arvidn
Copy link
Contributor Author

arvidn commented Nov 17, 2023

I don't really expect it to be very likely to restore the soft-fork3 tests. but worst case we can always:

git log -p -- chia/consensus/default_constants.py

@arvidn arvidn requested a review from emlowe November 21, 2023 16:29
@arvidn arvidn added the ready_to_merge Submitter and reviewers think this is ready label Nov 21, 2023
@cmmarslender cmmarslender merged commit c0deb18 into main Nov 21, 2023
489 of 494 checks passed
@cmmarslender cmmarslender deleted the enable-softfork3-unconditionally branch November 21, 2023 23:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changed Required label for PR that categorizes merge commit message as "Changed" for changelog Cleanup Code cleanup ready_to_merge Submitter and reviewers think this is ready
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants