diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-03-21 12:54:28 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-03-21 13:41:05 +0100 |
| commit | 29b2be6ad7898fcb871f6febbd45d0c7940398cd (patch) | |
| tree | 81473f5faa79dab2ac9a55a408d797413210019d /src/main.h | |
| parent | 9af69fa7e7b7c7db24411c646dbe3cf546669876 (diff) | |
| parent | cfd519e942aecd763449157a4a5ed602bcddd3a1 (diff) | |
Merge #7692: Remove p2p alert system
cfd519e Add release note documentation (BtcDrak)
6601ce5 protocol.h/cpp: Removes NetMsgType::ALERT (Thomas Kerin)
ad72104 Formatting (BtcDrak)
1b77471 Remove alert keys (BtcDrak)
01fdfef Remove `-alerts` option (BtcDrak)
9206634 Update alert notification and GUI (BtcDrak)
bbb9d1d Remove p2p alert handling (BtcDrak)
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/main.h b/src/main.h index ecb1efa5cb..a011ba4e55 100644 --- a/src/main.h +++ b/src/main.h @@ -42,8 +42,6 @@ class CValidationState; struct CNodeStateStats; struct LockPoints; -/** Default for accepting alerts from the P2P network. */ -static const bool DEFAULT_ALERTS = true; /** Default for DEFAULT_WHITELISTRELAY. */ static const bool DEFAULT_WHITELISTRELAY = true; /** Default for DEFAULT_WHITELISTFORCERELAY. */ @@ -154,7 +152,6 @@ extern size_t nCoinCacheUsage; extern CFeeRate minRelayTxFee; /** Absolute maximum transaction fee (in satoshis) used by wallet and mempool (rejects high fee in sendrawtransaction) */ extern CAmount maxTxFee; -extern bool fAlerts; /** If the tip is older than this (in seconds), the node is considered to be in initial block download. */ extern int64_t nMaxTipAge; extern bool fEnableReplacement; |