Skip to content

Commit

Permalink
Remove IsUAHFenableForCurrentBlock
Browse files Browse the repository at this point in the history
Summary: It's not useful anymore.

Test Plan:
  make check

Reviewers: freetrader, dagurval, kyuupichan, #bitcoin_abc

Reviewed By: kyuupichan, #bitcoin_abc

Differential Revision: https://reviews.bitcoinabc.org/D611
  • Loading branch information
deadalnix committed Oct 18, 2017
1 parent d45fe45 commit 80455aa
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 8 deletions.
2 changes: 0 additions & 2 deletions src/test/miner_tests.cpp
Expand Up @@ -734,8 +734,6 @@ BOOST_AUTO_TEST_CASE(BlockAssembler_construction) {
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);
Expand Down
5 changes: 0 additions & 5 deletions src/validation.cpp
Expand Up @@ -617,11 +617,6 @@ bool IsUAHFenabled(const Config &config, const CBlockIndex *pindexPrev) {
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,
Expand Down
1 change: 0 additions & 1 deletion src/validation.h
Expand Up @@ -373,7 +373,6 @@ void PruneBlockFilesManual(int nPruneUpToHeight);

/** 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
Expand Down

0 comments on commit 80455aa

Please sign in to comment.