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

fix: remove mn_rr fork usage from functional test of EHF #6270

Merged
merged 2 commits into from
Sep 17, 2024

Conversation

knst
Copy link
Collaborator

@knst knst commented Sep 13, 2024

Issue being fixed or feature implemented

Using mn_rr in feature_mnehf.py is a blocker for burying mn_rr fork.

What was done?

Removed useless conditions, uses testdummy fork instead mn_rr in ehf functional test.

How Has This Been Tested?

Run it test/functional/feature_mnehf.py

Breaking Changes

N/A

Checklist:

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated relevant unit/integration/functional/e2e tests
  • I have made corresponding changes to the documentation
  • I have assigned this pull request to a milestone

@knst knst added this to the 21.2 milestone Sep 13, 2024
self.log.info("activate MN_RR also by enabling spork 24")
assert_equal(get_bip9_details(node, 'mn_rr')['status'], 'defined')
self.log.info("Test spork 24 (EHF)")
assert_equal(get_bip9_details(node, 'testdummy')['status'], 'defined')
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
assert_equal(get_bip9_details(node, 'testdummy')['status'], 'defined')
self.check_fork('defined')

should also drop

        self.log.info(f"bip9: {get_bip9_details(node, 'mn_rr')}")
        assert_equal(get_bip9_details(node, 'mn_rr')['status'], 'active')

at the end of the test

Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 056d869

nit: PR title is misleading

@knst knst changed the title fix: use testdummy instead mn_rr fork for EHF functional test fix: remove mn_rr fork usage from functional test of EHF Sep 14, 2024
Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 056d869

@PastaPastaPasta PastaPastaPasta merged commit d754799 into dashpay:develop Sep 17, 2024
36 checks passed
PastaPastaPasta added a commit that referenced this pull request Oct 1, 2024
…ck - 6/n

9a9d0d5 feat: drop SPORK 24 (EHF) so far as this feature works on testnet / mainnet (Konstantin Akimov)
da0dc06 perf: optimize feature_mnehf.py by generating less blocks (Konstantin Akimov)
0de3923 feat: bury fork mn_rr (masternode reward reallocation) (Konstantin Akimov)

Pull request description:

  ## Issue being fixed or feature implemented
  MN_RR is activated on mainnet: time to bury it!

  ## What was done?
  Hard-fork mn_rr is buried. Prior fixes are done here: #6270 and #6269

  ## How Has This Been Tested?
  Run unit and functional tests

  ## Breaking Changes
  N/A

  ## Checklist:
  - [x] I have performed a self-review of my own code
  - [x] I have commented my code, particularly in hard-to-understand areas
  - [x] I have added or updated relevant unit/integration/functional/e2e tests
  - [x] I have made corresponding changes to the documentation
  - [x] I have assigned this pull request to a milestone

ACKs for top commit:
  UdjinM6:
    light ACK 9a9d0d5
  PastaPastaPasta:
    utACK 9a9d0d5

Tree-SHA512: 73ea0ca1270f15f6f1193efbaf402d476c84e9a843af85b7eae3e40199f4c943ad40f58e062b8db20e1c5c69c1a85579ebaf0722f1044ee2e1a4e7f96c58e645
@UdjinM6 UdjinM6 modified the milestones: 21.2, 22 Oct 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants