Merge 5d37c1bde0 into merged_master (Bitcoin PR #15976)

This commit is contained in:
Andrew Poelstra 2020-11-06 15:20:12 +00:00
commit cb15f46946
9 changed files with 274 additions and 240 deletions

View file

@ -197,7 +197,7 @@ public:
}
return GuessVerificationProgress(tip, Params().GetConsensus().nPowTargetSpacing);
}
bool isInitialBlockDownload() override { return IsInitialBlockDownload(); }
bool isInitialBlockDownload() override { return ::ChainstateActive().IsInitialBlockDownload(); }
bool getReindex() override { return ::fReindex; }
bool getImporting() override { return ::fImporting; }
void setNetworkActive(bool active) override