GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-13 12:33:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 80a699fda9 into merged_master (Bitcoin PR #21525)

Browse source
This commit is contained in:
Andrew Poelstra 2021-06-29 01:29:25 +00:00
commit bc51e4e896
15 changed files with 150 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/validation.cpp
View file

@ -175,7 +175,7 @@ namespace {
std::set<int> setDirtyFileInfo;
} // anon namespace
CBlockIndex* BlockManager::LookupBlockIndex(const uint256& hash)
CBlockIndex* BlockManager::LookupBlockIndex(const uint256& hash) const
{
AssertLockHeld(cs_main);
assert(std::addressof(g_chainman.BlockIndex()) == std::addressof(m_block_index));