diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -734,8 +734,6 @@ pindex = pindex->pprev; } - BOOST_CHECK(IsUAHFenabledForCurrentBlock(config)); - // Test around historical 1MB (plus one byte because that's mandatory) config.SetMaxBlockSize(ONE_MEGABYTE + 1); CheckBlockMaxSize(chainparams, 0, 1000); diff --git a/src/validation.h b/src/validation.h --- a/src/validation.h +++ b/src/validation.h @@ -373,7 +373,6 @@ /** Check is UAHF has activated. */ bool IsUAHFenabled(const Config &config, const CBlockIndex *pindexPrev); -bool IsUAHFenabledForCurrentBlock(const Config &config); /** (try to) add transaction to memory pool * plTxnReplaced will be appended to with all transactions replaced from mempool diff --git a/src/validation.cpp b/src/validation.cpp --- a/src/validation.cpp +++ b/src/validation.cpp @@ -617,11 +617,6 @@ return IsUAHFenabled(config, pindexPrev->nHeight); } -bool IsUAHFenabledForCurrentBlock(const Config &config) { - AssertLockHeld(cs_main); - return IsUAHFenabled(config, chainActive.Tip()); -} - // Used to avoid mempool polluting consensus critical paths if CCoinsViewMempool // were somehow broken and returning the wrong scriptPubKeys static bool CheckInputsFromMempoolAndCache(const CTransaction &tx,