Skip to content

Commit 41f2cc6

Browse files
committed
Merge bitcoin-core/gui#919: move-only: MAX_BLOCK_TIME_GAP to src/qt
fa5ed16 move-only: MAX_BLOCK_TIME_GAP to src/qt (MarcoFalke) Pull request description: `MAX_BLOCK_TIME_GAP` was used in some incorrect heuristics, which were removed in commit e30b6ea. This leaves a single module in src/qt using the constant. Instead of exposing it in a central kernel header, just move it to the single gui module that uses it. ACKs for top commit: sedited: ACK fa5ed16 hebasto: ACK fa5ed16, I have reviewed the code and it looks OK. Tree-SHA512: d0e0e5257f6585d793bfed118d61a3e5d56b2be397fa3b09b34db64e3e018eba9f223cd56541d258b422119fdd7501f07cd3bb8ad5dc28b535922aa21ea76fa6
2 parents 7c7cd8c + fa5ed16 commit 41f2cc6

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/chain.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,6 @@ static constexpr int64_t TIMESTAMP_WINDOW = MAX_FUTURE_BLOCK_TIME;
3939
static constexpr int32_t SEQ_ID_BEST_CHAIN_FROM_DISK = 0;
4040
static constexpr int32_t SEQ_ID_INIT_FROM_DISK = 1;
4141

42-
/**
43-
* Maximum gap between node time and block time used
44-
* for the "Catching up..." mode in GUI.
45-
*
46-
* Ref: https://github.com/bitcoin/bitcoin/pull/1026
47-
*/
48-
static constexpr int64_t MAX_BLOCK_TIME_GAP = 90 * 60;
49-
5042
enum BlockStatus : uint32_t {
5143
//! Unused.
5244
BLOCK_VALID_UNKNOWN = 0,

src/qt/bitcoingui.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,14 @@
7272
#include <QWindow>
7373

7474

75+
/**
76+
* Maximum gap between node time and block time used
77+
* for the "Catching up..." mode in GUI.
78+
*
79+
* Ref: https://github.com/bitcoin/bitcoin/pull/1026
80+
*/
81+
static constexpr int64_t MAX_BLOCK_TIME_GAP = 90 * 60;
82+
7583
const std::string BitcoinGUI::DEFAULT_UIPLATFORM =
7684
#if defined(Q_OS_MACOS)
7785
"macosx"

0 commit comments

Comments
 (0)