From 0351469bb579bc9f10c7eccd483431c077ec992f Mon Sep 17 00:00:00 2001 From: Konstantin Akimov Date: Fri, 16 Aug 2024 15:16:13 +0700 Subject: [PATCH 1/2] refactor: removed duplicated meaningless condition from Check mnhftx --- src/evo/mnhftx.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/evo/mnhftx.cpp b/src/evo/mnhftx.cpp index 788d25f4fd0e..22b95062b108 100644 --- a/src/evo/mnhftx.cpp +++ b/src/evo/mnhftx.cpp @@ -231,10 +231,7 @@ std::optional 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); From 056d869571d25030635ead895d40dc340b70a3ae Mon Sep 17 00:00:00 2001 From: Konstantin Akimov Date: Thu, 12 Sep 2024 14:26:06 +0700 Subject: [PATCH 2/2] refactor: use testdummy in feature_mnehf functional test, removed useless checks --- test/functional/feature_mnehf.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/test/functional/feature_mnehf.py b/test/functional/feature_mnehf.py index b12e9c8c12ac..cadbbbc2caa9 100755 --- a/test/functional/feature_mnehf.py +++ b/test/functional/feature_mnehf.py @@ -19,7 +19,6 @@ from test_framework.test_framework import DashTestFramework from test_framework.util import ( assert_equal, - assert_greater_than, get_bip9_details, ) @@ -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() @@ -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) @@ -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() @@ -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__':