Skip to content

Rename softfork#17799

Merged
pmaslana merged 2 commits into
mainfrom
rename-softfork
Mar 29, 2024
Merged

Rename softfork#17799
pmaslana merged 2 commits into
mainfrom
rename-softfork

Conversation

@arvidn
Copy link
Copy Markdown
Contributor

@arvidn arvidn commented Mar 29, 2024

Purpose:

a recent PR introduced soft-fork 3, to activate message conditions. We've already had a soft-fork 3, and it's activated and removed from the code base.

This PR renames the recent soft-fork to soft-fork 4 to avoid any confusion.

It also removes two disabled tests from the (cancelled and reverted CHIP-13 patch) that refer to soft-fork 4 as the CHIP-13 soft fork.

Current Behavior:

The next soft-fork is called 3.

New Behavior:

The next soft-fork is called 4.

tests

With this change:

$ git grep SOFT_FORK3
CHANGELOG.md:- Bump SOFT_FORK3_HEIGHT to align with the next release cycle

That's the changelog mentioning the previous soft-fork 3

$ git grep SOFT_FORK_3

Returns no hits

@arvidn arvidn added the Changed Required label for PR that categorizes merge commit message as "Changed" for changelog label Mar 29, 2024
@arvidn arvidn marked this pull request as ready for review March 29, 2024 08:35
@arvidn arvidn requested a review from a team as a code owner March 29, 2024 08:35
@arvidn arvidn requested a review from AmineKhaldi March 29, 2024 09:28
@arvidn arvidn added the ready_to_merge Submitter and reviewers think this is ready label Mar 29, 2024
@pmaslana pmaslana merged commit 4b90197 into main Mar 29, 2024
@pmaslana pmaslana deleted the rename-softfork branch March 29, 2024 15:41
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 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