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/protocol.cpp | |
| parent | 9af69fa7e7b7c7db24411c646dbe3cf546669876 (diff) | |
| parent | cfd519e942aecd763449157a4a5ed602bcddd3a1 (diff) | |
| download | bitcoin-29b2be6ad7898fcb871f6febbd45d0c7940398cd.tar.xz | |
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/protocol.cpp')
| -rw-r--r-- | src/protocol.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/protocol.cpp b/src/protocol.cpp index c1c7c0b96b..1ddb65b796 100644 --- a/src/protocol.cpp +++ b/src/protocol.cpp @@ -28,7 +28,6 @@ const char *GETADDR="getaddr"; const char *MEMPOOL="mempool"; const char *PING="ping"; const char *PONG="pong"; -const char *ALERT="alert"; const char *NOTFOUND="notfound"; const char *FILTERLOAD="filterload"; const char *FILTERADD="filteradd"; @@ -64,7 +63,6 @@ const static std::string allNetMessageTypes[] = { NetMsgType::MEMPOOL, NetMsgType::PING, NetMsgType::PONG, - NetMsgType::ALERT, NetMsgType::NOTFOUND, NetMsgType::FILTERLOAD, NetMsgType::FILTERADD, |