diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-08-01 22:57:55 +0200 |
---|---|---|
committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-08-09 01:43:23 +0200 |
commit | eb0b56b19017ab5c16c745e6da39c53126924ed6 (patch) | |
tree | 3d59b76170293cebb37b57fd7669faf7f333623c /src/test | |
parent | de89257fc516a68c89da0c70858c9c2b86a701f7 (diff) | |
download | bitcoin-eb0b56b19017ab5c16c745e6da39c53126924ed6.tar.xz |
Simplify serialize.h's exception handling
Remove the 'state' and 'exceptmask' from serialize.h's stream implementations,
as well as related methods.
As exceptmask always included 'failbit', and setstate was always called with
bits = failbit, all it did was immediately raise an exception. Get rid of
those variables, and replace the setstate with direct exception throwing
(which also removes some dead code).
As a result, good() is never reached after a failure (there are only 2
calls, one of which is in tests), and can just be replaced by !eof().
fail(), clear(n) and exceptions() are just never called. Delete them.
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/alert_tests.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/alert_tests.cpp b/src/test/alert_tests.cpp index b16f3f7f57..e3066a51ab 100644 --- a/src/test/alert_tests.cpp +++ b/src/test/alert_tests.cpp @@ -83,7 +83,7 @@ struct ReadAlerts std::vector<unsigned char> vch(alert_tests::alertTests, alert_tests::alertTests + sizeof(alert_tests::alertTests)); CDataStream stream(vch, SER_DISK, CLIENT_VERSION); try { - while (stream.good()) + while (!stream.eof()) { CAlert alert; stream >> alert; |