Skip to content

Commit

Permalink
Merge bitcoin#7692: Remove p2p alert system
Browse files Browse the repository at this point in the history
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)

manual fixes

Signed-off-by: Pasta <pasta@dashboost.org>

remove sendalert.cpp

Signed-off-by: Pasta <pasta@dashboost.org>

CAlertNotify -> AlertNotify

Signed-off-by: Pasta <pasta@dashboost.org>

remove alert.h

Signed-off-by: Pasta <pasta@dashboost.org>

remove vAlertPubKey for DevNet

Signed-off-by: Pasta <pasta@dashboost.org>

remove src/main.cpp
  • Loading branch information
laanwj authored and PastaPastaPasta committed Jun 22, 2019
1 parent 1f6e043 commit a1770b0
Show file tree
Hide file tree
Showing 19 changed files with 89 additions and 836 deletions.
3 changes: 0 additions & 3 deletions src/Makefile.am
Expand Up @@ -105,7 +105,6 @@ BITCOIN_CORE_H = \
addressindex.h \
spentindex.h \
addrman.h \
alert.h \
base58.h \
batchedlogger.h \
bip39.h \
Expand Down Expand Up @@ -262,7 +261,6 @@ libdash_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
libdash_server_a_SOURCES = \
addrdb.cpp \
addrman.cpp \
alert.cpp \
batchedlogger.cpp \
bloom.cpp \
blockencodings.cpp \
Expand Down Expand Up @@ -330,7 +328,6 @@ libdash_server_a_SOURCES = \
rpc/server.cpp \
script/sigcache.cpp \
script/ismine.cpp \
sendalert.cpp \
spork.cpp \
timedata.cpp \
torcontrol.cpp \
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.test.include
Expand Up @@ -20,7 +20,7 @@ JSON_TEST_FILES = \
test/data/tx_valid.json \
test/data/sighash.json

RAW_TEST_FILES = test/data/alertTests.raw
RAW_TEST_FILES =

GENERATED_TEST_FILES = $(JSON_TEST_FILES:.json=.json.h) $(RAW_TEST_FILES:.raw=.raw.h)

Expand Down
286 changes: 0 additions & 286 deletions src/alert.cpp

This file was deleted.

0 comments on commit a1770b0

Please sign in to comment.