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

Merge 45e65376ac into merged_master (Bitcoin PR #17382)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-09 21:20:53 +00:00
commit f5036e8b4b
2 changed files with 0 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/node/coinstats.cpp
View file

@ -14,8 +14,6 @@
#include <map>
#include <boost/thread.hpp>
static void ApplyStats(CCoinsStats &stats, CHashWriter& ss, const uint256& hash, const std::map<uint32_t, Coin>& outputs)
{
assert(!outputs.empty());
@ -55,7 +53,6 @@ bool GetUTXOStats(CCoinsView *view, CCoinsStats &stats)
uint256 prevkey;
std::map<uint32_t, Coin> outputs;
while (pcursor->Valid()) {
boost::this_thread::interruption_point();
COutPoint key;
Coin coin;
if (pcursor->GetKey(key) && pcursor->GetValue(coin)) {

3
src/rpc/blockchain.cpp
View file

@ -41,8 +41,6 @@
#include <univalue.h>
#include <boost/thread/thread.hpp> // boost::thread::interrupt
#include <condition_variable>
#include <memory>
#include <mutex>
@ -2133,7 +2131,6 @@ bool FindScriptPubKey(std::atomic<int>& scan_progress, const std::atomic<bool>&
Coin coin;
if (!cursor->GetKey(key) || !cursor->GetValue(coin)) return false;
if (++count % 8192 == 0) {
boost::this_thread::interruption_point();
if (should_abort) {
// allow to abort the scan via the abort reference
return false;