mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-10 09:06:15 +01:00
Code Issues Projects Releases Wiki Activity

rpc: Use CHECK_NONFATAL over Assert

Browse source
This commit is contained in:
MarcoFalke 2024-07-11 17:38:43 +02:00
parent 9b480f7a25
commit fa6270737e
No known key found for this signature in database
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/rpc/blockchain.cpp
View file

@ -801,14 +801,14 @@ std::optional<int> GetPruneHeight(const BlockManager& blockman, const CChain& ch
// If the chain tip is pruned, everything is pruned. // If the chain tip is pruned, everything is pruned.
if (!((chain_tip->nStatus & BLOCK_HAVE_MASK) == BLOCK_HAVE_MASK)) return chain_tip->nHeight; if (!((chain_tip->nStatus & BLOCK_HAVE_MASK) == BLOCK_HAVE_MASK)) return chain_tip->nHeight;
const auto& first_unpruned{*Assert(blockman.GetFirstBlock(*chain_tip, /*status_mask=*/BLOCK_HAVE_MASK, first_block))}; const auto& first_unpruned{*CHECK_NONFATAL(blockman.GetFirstBlock(*chain_tip, /*status_mask=*/BLOCK_HAVE_MASK, first_block))};
if (&first_unpruned == first_block) { if (&first_unpruned == first_block) {
// All blocks between first_block and chain_tip have data, so nothing is pruned. // All blocks between first_block and chain_tip have data, so nothing is pruned.
return std::nullopt; return std::nullopt;
} }
// Block before the first unpruned block is the last pruned block. // Block before the first unpruned block is the last pruned block.
return Assert(first_unpruned.pprev)->nHeight; return CHECK_NONFATAL(first_unpruned.pprev)->nHeight;
} }
static RPCHelpMan pruneblockchain() static RPCHelpMan pruneblockchain()

10
test/lint/lint-assertions.py
View file

@ -27,8 +27,9 @@ def main():
# checks should be used over assert. See: src/util/check.h # checks should be used over assert. See: src/util/check.h
# src/rpc/server.cpp is excluded from this check since it's mostly meta-code. # src/rpc/server.cpp is excluded from this check since it's mostly meta-code.
exit_code = git_grep([ exit_code = git_grep([
"-nE", "--line-number",
r"\<(A|a)ss(ume|ert) *\(.*\);", "--extended-regexp",
r"\<(A|a)ss(ume|ert)\(",
"--", "--",
"src/rpc/", "src/rpc/",
"src/wallet/rpc*", "src/wallet/rpc*",
@ -38,8 +39,9 @@ def main():
# The `BOOST_ASSERT` macro requires to `#include boost/assert.hpp`, # The `BOOST_ASSERT` macro requires to `#include boost/assert.hpp`,
# which is an unnecessary Boost dependency. # which is an unnecessary Boost dependency.
exit_code |= git_grep([ exit_code |= git_grep([
"-E", "--line-number",
r"BOOST_ASSERT *\(.*\);", "--extended-regexp",
r"BOOST_ASSERT\(",
"--", "--",
"*.cpp", "*.cpp",
"*.h", "*.h",