Merge 9ab9d63569 into merged_master (Bitcoin PR #16503)

This commit is contained in:
Andrew Poelstra 2020-11-09 21:20:12 +00:00
commit 766d79d33f
4 changed files with 3 additions and 12 deletions

View file

@ -333,7 +333,6 @@ public:
LOCK(cs_main);
return ::fHavePruned;
}
bool p2pEnabled() override { return g_connman != nullptr; }
bool isReadyToBroadcast() override { return !::fImporting && !::fReindex && !isInitialBlockDownload(); }
bool isInitialBlockDownload() override { return ::ChainstateActive().IsInitialBlockDownload(); }
bool shutdownRequested() override { return ShutdownRequested(); }