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

Merge 4ede05d421 into merged_master (Bitcoin PR #18758)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 01:08:58 +00:00
commit 195eb8a243
8 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/txdb.cpp
View file

@ -16,8 +16,6 @@
#include <stdint.h>
#include <boost/thread.hpp>
// ELEMENTS
#include <block_proof.h> // CheckProof
@ -286,7 +284,6 @@ bool CBlockTreeDB::LoadBlockIndexGuts(const Consensus::Params& consensusParams,
// Load m_block_index
while (pcursor->Valid()) {
boost::this_thread::interruption_point();
if (ShutdownRequested()) return false;
std::pair<char, uint256> key;
if (pcursor->GetKey(key) && key.first == DB_BLOCK_INDEX) {
@ -405,7 +402,6 @@ bool CCoinsViewDB::Upgrade() {
std::pair<unsigned char, uint256> key;
std::pair<unsigned char, uint256> prev_key = {DB_COINS, uint256()};
while (pcursor->Valid()) {
boost::this_thread::interruption_point();
if (ShutdownRequested()) {
break;
}