foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-09 10:43:19 -05:00
Code Issues Activity

Remove reindex special case from the progress bar label

Browse source
This commit is contained in:
MarcoFalke 2023-01-17 16:46:33 +01:00
parent 5a80086ec2
commit faff2ba4f8
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
5 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/interfaces/node.h
View file

@ -177,11 +177,8 @@ public:
//! Is initial block download. //! Is initial block download.
virtual bool isInitialBlockDownload() = 0; virtual bool isInitialBlockDownload() = 0;
//! Get reindex. //! Is loading blocks.
virtual bool getReindex() = 0; virtual bool isLoadingBlocks() = 0;
//! Get importing.
virtual bool getImporting() = 0;
//! Set network active. //! Set network active.
virtual void setNetworkActive(bool active) = 0; virtual void setNetworkActive(bool active) = 0;

3
src/node/interfaces.cpp
View file

@ -295,8 +295,7 @@ public:
bool isInitialBlockDownload() override { bool isInitialBlockDownload() override {
return chainman().ActiveChainstate().IsInitialBlockDownload(); return chainman().ActiveChainstate().IsInitialBlockDownload();
} }
bool getReindex() override { return node::fReindex; } bool isLoadingBlocks() override { return node::fReindex || node::fImporting; }
bool getImporting() override { return node::fImporting; }
void setNetworkActive(bool active) override void setNetworkActive(bool active) override
{ {
if (m_context->connman) { if (m_context->connman) {

5
src/qt/bitcoingui.cpp
View file

@ -1071,7 +1071,7 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
statusBar()->clearMessage(); statusBar()->clearMessage();
// Acquire current block source // Acquire current block source
enum BlockSource blockSource = clientModel->getBlockSource(); BlockSource blockSource{clientModel->getBlockSource()};
switch (blockSource) { switch (blockSource) {
case BlockSource::NETWORK: case BlockSource::NETWORK:
if (synctype == SyncType::HEADER_PRESYNC) { if (synctype == SyncType::HEADER_PRESYNC) {
@ -1091,9 +1091,6 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
progressBarLabel->setText(tr("Processing blocks on disk…")); progressBarLabel->setText(tr("Processing blocks on disk…"));
} }
break; break;
case BlockSource::REINDEX:
progressBarLabel->setText(tr("Reindexing blocks on disk…"));
break;
case BlockSource::NONE: case BlockSource::NONE:
if (synctype != SyncType::BLOCK_SYNC) { if (synctype != SyncType::BLOCK_SYNC) {
return; return;

11
src/qt/clientmodel.cpp
View file

@ -146,15 +146,10 @@ uint256 ClientModel::getBestBlockHash()
return m_cached_tip_blocks; return m_cached_tip_blocks;
} }
enum BlockSource ClientModel::getBlockSource() const BlockSource ClientModel::getBlockSource() const
{ {
if (m_node.getReindex()) if (m_node.isLoadingBlocks()) return BlockSource::DISK;
return BlockSource::REINDEX; if (getNumConnections() > 0) return BlockSource::NETWORK;
else if (m_node.getImporting())
return BlockSource::DISK;
else if (getNumConnections() > 0)
return BlockSource::NETWORK;
return BlockSource::NONE; return BlockSource::NONE;
} }

7
src/qt/clientmodel.h
View file

@ -32,9 +32,8 @@ QT_END_NAMESPACE
enum class BlockSource { enum class BlockSource {
NONE, NONE,
REINDEX,
DISK, DISK,
NETWORK NETWORK,
}; };
enum class SyncType { enum class SyncType {
@ -72,8 +71,8 @@ public:
int getHeaderTipHeight() const; int getHeaderTipHeight() const;
int64_t getHeaderTipTime() const; int64_t getHeaderTipTime() const;
//! Returns enum BlockSource of the current importing/syncing state //! Returns the block source of the current importing/syncing state
enum BlockSource getBlockSource() const; BlockSource getBlockSource() const;
//! Return warnings to be displayed in status bar //! Return warnings to be displayed in status bar
QString getStatusBarWarnings() const; QString getStatusBarWarnings() const;