One of the goals of #27783 was to get rid of the BOOST_ASSERT macros instead of including the boost/assert.hpp headers. See #27783 (review).
It turns out that a couple of those macros sneaked into the codebase in #27790.
This PR makes the linter guard against new instances of the BOOST_ASSERT macros and replaces the current ones.
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--021abf342d371248e50ceaed478a90ca-->
See the guideline for information on the review process.
| Type | Reviewers |
|---|---|
| ACK | kevkevinpal, stickies-v, TheCharlatan |
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
104 | + if e.returncode > 1: 105 | + raise e 106 | + elif e.returncode == 1: 107 | + return extra_boosts 108 | + 109 | + extra_boosts.add("BOOST_ASSERT")
Any reason to put this here, instead of in ./test/lint/lint-assertions.py?
Updated 82f694a61716d182fef4b85b1c38a812649eeff0 -> de5e464787ad41c631c81ab690d0cf64bea18060 (pr27889.01 -> pr27889.02, diff):
51 | + "-E", 52 | + r"BOOST_ASSERT *\(.*\);", 53 | + "--", 54 | + "*.cpp", 55 | + "*.h", 56 | + ], "BOOST_ASSERT must replaced with non-Boost alternatives.")
], "BOOST_ASSERT must replaced with Assert, BOOST_REQUIRE, or BOOST_CHECK*.")
The `BOOST_ASSERT` macro requires to `#include boost/assert.hpp`.
Updated de5e464787ad41c631c81ab690d0cf64bea18060 -> 28fff06afe98177c14a932abf95b380bb51c6653 (pr27889.02 -> pr27889.03, diff):
ACK 28fff06
did on a grep on 427853ab49f610e971b73ea4cc1d5366747e52b1
grep -nri "BOOST_ASSERT" ./src and grep -nri "BOOST_ASSERT" ./test
found the two instances of BOOST_ASSERT you removed
ACK 28fff06af
No need for BOOST_ASSERT. Verified that the test works:
./test/lint/all-lint.py
BOOST_ASSERT must be replaced with Assert, BOOST_REQUIRE, or BOOST_CHECK.
src/wallet/test/db_tests.cpp: BOOST_ASSERT(status == DatabaseCursor::Status::MORE);
^---- failure generated from lint-assertions.py
ACK 28fff06afe98177c14a932abf95b380bb51c6653