Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove p2p alert system #7692

Merged
merged 7 commits into from
Mar 21, 2016
Merged

Remove p2p alert system #7692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bbb9d1d
Remove p2p alert handling
btcdrak Mar 7, 2016
9206634
Update alert notification and GUI
btcdrak Mar 6, 2016
01fdfef
Remove `-alerts` option
btcdrak Mar 6, 2016
1b77471
Remove alert keys
btcdrak Mar 6, 2016
ad72104
Formatting
btcdrak Mar 16, 2016
6601ce5
protocol.h/cpp: Removes NetMsgType::ALERT
afk11 Mar 18, 2016
cfd519e
Add release note documentation
btcdrak Mar 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions doc/release-notes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ The following outputs are affected by this change:

### P2P protocol and network code

The p2p alert system has been removed in #7692 and the 'alert' message is no longer supported.

### Validation

### Build system
Expand Down
2 changes: 0 additions & 2 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ endif
# bitcoin core #
BITCOIN_CORE_H = \
addrman.h \
alert.h \
base58.h \
bloom.h \
chain.h \
Expand Down Expand Up @@ -176,7 +175,6 @@ libbitcoin_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CP
libbitcoin_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
libbitcoin_server_a_SOURCES = \
addrman.cpp \
alert.cpp \
bloom.cpp \
chain.cpp \
checkpoints.cpp \
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.test.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ JSON_TEST_FILES = \
test/data/tx_valid.json \
test/data/sighash.json

RAW_TEST_FILES = test/data/alertTests.raw
RAW_TEST_FILES =
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here you are deleting the only RAW_TEST_FILE definition - please remove it in the rest of the file or leave this variable empty here to not cause confusion (and keep it for the future).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it may be better to empty it instead, in case raw test files are added in the future

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added it back.


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

Expand Down
266 changes: 0 additions & 266 deletions src/alert.cpp
View file
Open in desktop

This file was deleted.

Loading