feat: drop SPORK 24 (EHF) so far as this feature works on testnet / m…

…ainnet
dashpay · Sep 19, 2024 · addbd87 · addbd87
1 parent 4fa6120
commit addbd87
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/src/llmq/ehf_signals.cpp b/src/llmq/ehf_signals.cpp
@@ -48,7 +48,7 @@ void CEHFSignalsHandler::UpdatedBlockTip(const CBlockIndex* const pindexNew, boo
 {
     if (!DeploymentActiveAfter(pindexNew, Params().GetConsensus(), Consensus::DEPLOYMENT_V20)) return;
 
-    if (!is_masternode || (Params().IsTestChain() && !sporkman.IsSporkActive(SPORK_24_TEST_EHF))) {
+    if (!is_masternode) {
         return;
     }
 

diff --git a/src/spork.h b/src/spork.h
@@ -42,7 +42,7 @@ enum SporkId : int32_t {
     SPORK_19_CHAINLOCKS_ENABLED                            = 10018,
     SPORK_21_QUORUM_ALL_CONNECTED                          = 10020,
     SPORK_23_QUORUM_POSE                                   = 10022,
-    SPORK_24_TEST_EHF                                      = 10023,
+    // SPORK_24_DEPRECATED = 10023,
 
     SPORK_INVALID                                          = -1,
 };
@@ -76,7 +76,6 @@ struct CSporkDef
     MAKE_SPORK_DEF(SPORK_19_CHAINLOCKS_ENABLED,            4070908800ULL), // OFF
     MAKE_SPORK_DEF(SPORK_21_QUORUM_ALL_CONNECTED,          4070908800ULL), // OFF
     MAKE_SPORK_DEF(SPORK_23_QUORUM_POSE,                   4070908800ULL), // OFF
-    MAKE_SPORK_DEF(SPORK_24_TEST_EHF,                      4070908800ULL), // OFF
 };
 #undef MAKE_SPORK_DEF
 

diff --git a/test/functional/feature_mnehf.py b/test/functional/feature_mnehf.py
@@ -246,10 +246,6 @@ def run_test(self):
         ehf_tx_new_start = self.create_mnehf(28, pubkey)
 
         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()
-
         self.check_fork('defined')
 
         self.log.info("Mine one block and ensure EHF tx for the new deployment is mined")