Merge 786654aa5e into merged_master (Bitcoin PR #21498)

This commit is contained in:
Andrew Poelstra 2021-06-27 21:54:10 +00:00
commit 3a62250bbc
2 changed files with 2 additions and 2 deletions

View file

@ -5545,7 +5545,7 @@ std::optional<uint256> ChainstateManager::SnapshotBlockhash() const {
// If a snapshot chainstate exists, it will always be our active.
return m_active_chainstate->m_from_snapshot_blockhash;
}
return {};
return std::nullopt;
}
std::vector<CChainState*> ChainstateManager::GetAll()