Skip to content

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

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.

Sign up for GitHub

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

Merged
PastaPastaPasta merged 2 commits into from
Sep 17, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0351469
refactor: removed duplicated meaningless condition from Check mnhftx
knst Aug 16, 2024
056d869
refactor: use testdummy in feature_mnehf functional test, removed use…
knst Sep 12, 2024
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
5 changes: 1 addition & 4 deletions src/evo/mnhftx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,7 @@ std::optional<CMNHFManager::Signals> CMNHFManager::ProcessBlock(const CBlock& bl
return signals;
}
for (const auto& versionBit : new_signals) {
if (Params().IsValidMNActivation(versionBit, pindex->GetMedianTimePast())) {
signals.insert({versionBit, mined_height});
}

signals.insert({versionBit, mined_height});
}

AddToCache(signals, pindex);
Expand Down
14 changes: 3 additions & 11 deletions test/functional/feature_mnehf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
from test_framework.test_framework import DashTestFramework
from test_framework.util import (
assert_equal,
assert_greater_than,
get_bip9_details,
)

Expand Down Expand Up @@ -133,12 +132,10 @@ def run_test(self):
self.set_sporks()
self.activate_v20()
self.log.info(f"After v20 activation should be plenty of blocks: {node.getblockcount()}")
assert_greater_than(node.getblockcount(), 900)
assert_equal(get_bip9_details(node, 'testdummy')['status'], 'defined')

self.log.info("Mine a quorum...")
self.mine_quorum()
assert_equal(get_bip9_details(node, 'testdummy')['status'], 'defined')
self.check_fork('defined')

key = ECKey()
key.generate()
Expand All @@ -154,9 +151,6 @@ def run_test(self):
self.log.info("Checking correctness of requestId and quorumHash")
assert_equal(mnehf_payload.quorumHash, int(self.mninfo[0].node.quorum("selectquorum", 100, 'a0eee872d7d3170dd20d5c5e8380c92b3aa887da5f63d8033289fafa35a90691')["quorumHash"], 16))

assert_equal(get_bip9_details(node, 'testdummy')['status'], 'defined')
assert_equal(get_bip9_details(node, 'mn_rr')['status'], 'defined')

ehf_tx_sent = self.send_tx(ehf_tx)
self.log.info(f"ehf tx: {ehf_tx_sent}")
ehf_unknown_tx_sent = self.send_tx(ehf_unknown_tx)
Expand Down Expand Up @@ -251,8 +245,8 @@ def run_test(self):

ehf_tx_new_start = self.create_mnehf(28, pubkey)

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)")
self.check_fork('defined')
self.nodes[0].sporkupdate("SPORK_24_TEST_EHF", 0)
self.wait_for_sporks_same()

Expand All @@ -268,8 +262,6 @@ def run_test(self):
self.check_fork('defined')
self.slowly_generate_batch(12 * 4)
self.check_fork('active')
self.log.info(f"bip9: {get_bip9_details(node, 'mn_rr')}")
assert_equal(get_bip9_details(node, 'mn_rr')['status'], 'active')


if __name__ == '__main__':
Expand Down