diff options
| author | Antoine Riard <ariard@student.42.fr> | 2019-03-26 16:46:22 +0000 |
|---|---|---|
| committer | Antoine Riard <ariard@student.42.fr> | 2019-03-27 18:29:48 -0400 |
| commit | 765c0b364d41e9a251c3f88cbe203645854fd790 (patch) | |
| tree | 6d6daaaba9d8f8f22eddaf4882f5c26db82b71c5 /src/chain.cpp | |
| parent | 8a8b03ecd2218dcdbcbf3127f2fa94f0f0da4698 (diff) | |
| download | bitcoin-765c0b364d41e9a251c3f88cbe203645854fd790.tar.xz | |
refactor: combine Chain::findFirstBlockWithTime/findFirstBlockWithTimeAndHeight
As suggested in #14711, pass height to CChain::FindEarliestAtLeast to
simplify Chain interface by combining findFirstBlockWithTime and
findFirstBlockWithTimeAndHeight into one
Extend findearliestatleast_edge_test in consequence
Diffstat (limited to 'src/chain.cpp')
| -rw-r--r-- | src/chain.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/chain.cpp b/src/chain.cpp index d462f94ab5..5520d8149a 100644 --- a/src/chain.cpp +++ b/src/chain.cpp @@ -59,10 +59,11 @@ const CBlockIndex *CChain::FindFork(const CBlockIndex *pindex) const { return pindex; } -CBlockIndex* CChain::FindEarliestAtLeast(int64_t nTime) const +CBlockIndex* CChain::FindEarliestAtLeast(int64_t nTime, int height) const { - std::vector<CBlockIndex*>::const_iterator lower = std::lower_bound(vChain.begin(), vChain.end(), nTime, - [](CBlockIndex* pBlock, const int64_t& time) -> bool { return pBlock->GetBlockTimeMax() < time; }); + std::pair<int64_t, int> blockparams = std::make_pair(nTime, height); + std::vector<CBlockIndex*>::const_iterator lower = std::lower_bound(vChain.begin(), vChain.end(), blockparams, + [](CBlockIndex* pBlock, const std::pair<int64_t, int>& blockparams) -> bool { return pBlock->GetBlockTimeMax() < blockparams.first || pBlock->nHeight < blockparams.second; }); return (lower == vChain.end() ? nullptr : *lower); } |