mirror of
https://github.com/bitcoin/bitcoin.git
synced 2024-11-20 02:25:40 +01:00
Merge bitcoin/bitcoin#27774: refactor: Add [[nodiscard]] where ignoring a Result return type is an error
fa5680b752
fix includes for touched header files (iwyu) (MarcoFalke)dddde27f6f
Add [[nodiscard]] where ignoring a Result return type is an error (MarcoFalke) Pull request description: Only add it for those where it is an error to ignore. Also, fix the gcc compile warning https://github.com/bitcoin/bitcoin/pull/25977#issuecomment-1564350880. Also, fix iwyu for touched header files. ACKs for top commit: TheCharlatan: ACKfa5680b752
stickies-v: ACKfa5680b752
Tree-SHA512: c3509103bfeae246e2cf565bc561fcd68d8118515bac5431ba5304c3a63c8254b9c4f40e268b6f6d6b79405675c5a960db9b4eb3bdd14aedca333dc1c9e76415
This commit is contained in:
commit
214f8f18b3
@ -210,7 +210,8 @@ util::Result<std::unique_ptr<AddrMan>> LoadAddrman(const NetGroupManager& netgro
|
||||
return util::Error{strprintf(_("Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start."),
|
||||
e.what(), PACKAGE_BUGREPORT, fs::quoted(fs::PathToString(path_addr)))};
|
||||
}
|
||||
return std::move(addrman); // std::move should be unneccessary but is temporarily needed to work around clang bug (https://github.com/bitcoin/bitcoin/pull/25977#issuecomment-1561270092)
|
||||
return {std::move(addrman)}; // std::move should be unneccessary but is temporarily needed to work around clang bug
|
||||
// (https://github.com/bitcoin/bitcoin/pull/25977#issuecomment-1561270092)
|
||||
}
|
||||
|
||||
void DumpAnchors(const fs::path& anchors_db_path, const std::vector<CAddress>& anchors)
|
||||
|
@ -6,12 +6,11 @@
|
||||
#ifndef BITCOIN_ADDRDB_H
|
||||
#define BITCOIN_ADDRDB_H
|
||||
|
||||
#include <net_types.h> // For banmap_t
|
||||
#include <univalue.h>
|
||||
#include <net_types.h>
|
||||
#include <util/fs.h>
|
||||
#include <util/result.h>
|
||||
|
||||
#include <optional>
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
class ArgsManager;
|
||||
@ -19,7 +18,6 @@ class AddrMan;
|
||||
class CAddress;
|
||||
class CDataStream;
|
||||
class NetGroupManager;
|
||||
struct bilingual_str;
|
||||
|
||||
bool DumpPeerAddresses(const ArgsManager& args, const AddrMan& addr);
|
||||
/** Only used by tests. */
|
||||
|
@ -7,8 +7,6 @@
|
||||
|
||||
#include <util/result.h>
|
||||
|
||||
struct bilingual_str;
|
||||
|
||||
namespace kernel {
|
||||
|
||||
struct Context;
|
||||
@ -16,8 +14,7 @@ struct Context;
|
||||
/**
|
||||
* Ensure a usable environment with all necessary library support.
|
||||
*/
|
||||
util::Result<void> SanityChecks(const Context&);
|
||||
|
||||
}
|
||||
[[nodiscard]] util::Result<void> SanityChecks(const Context&);
|
||||
} // namespace kernel
|
||||
|
||||
#endif // BITCOIN_KERNEL_CHECKS_H
|
||||
|
@ -12,7 +12,7 @@
|
||||
class ArgsManager;
|
||||
|
||||
namespace node {
|
||||
util::Result<void> ApplyArgsManOptions(const ArgsManager& args, BlockManager::Options& opts);
|
||||
[[nodiscard]] util::Result<void> ApplyArgsManOptions(const ArgsManager& args, BlockManager::Options& opts);
|
||||
} // namespace node
|
||||
|
||||
#endif // BITCOIN_NODE_BLOCKMANAGER_ARGS_H
|
||||
|
@ -11,7 +11,7 @@
|
||||
class ArgsManager;
|
||||
|
||||
namespace node {
|
||||
util::Result<void> ApplyArgsManOptions(const ArgsManager& args, ChainstateManager::Options& opts);
|
||||
[[nodiscard]] util::Result<void> ApplyArgsManOptions(const ArgsManager& args, ChainstateManager::Options& opts);
|
||||
} // namespace node
|
||||
|
||||
#endif // BITCOIN_NODE_CHAINSTATEMANAGER_ARGS_H
|
||||
|
@ -13,6 +13,9 @@
|
||||
#include <util/fs.h>
|
||||
#include <util/result.h>
|
||||
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include <functional>
|
||||
#include <memory>
|
||||
#include <optional>
|
||||
#include <string>
|
||||
@ -21,11 +24,11 @@
|
||||
|
||||
class CBlockFileInfo;
|
||||
class CBlockIndex;
|
||||
class COutPoint;
|
||||
class uint256;
|
||||
namespace Consensus {
|
||||
struct Params;
|
||||
};
|
||||
struct bilingual_str;
|
||||
|
||||
//! -dbcache default (MiB)
|
||||
static const int64_t nDefaultDbCache = 450;
|
||||
@ -99,6 +102,6 @@ public:
|
||||
EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
|
||||
};
|
||||
|
||||
util::Result<void> CheckLegacyTxindex(CBlockTreeDB& block_tree_db);
|
||||
[[nodiscard]] util::Result<void> CheckLegacyTxindex(CBlockTreeDB& block_tree_db);
|
||||
|
||||
#endif // BITCOIN_TXDB_H
|
||||
|
@ -1074,7 +1074,7 @@ struct MigrationResult {
|
||||
};
|
||||
|
||||
//! Do all steps to migrate a legacy wallet to a descriptor wallet
|
||||
util::Result<MigrationResult> MigrateLegacyToDescriptor(const std::string& wallet_name, const SecureString& passphrase, WalletContext& context);
|
||||
[[nodiscard]] util::Result<MigrationResult> MigrateLegacyToDescriptor(const std::string& wallet_name, const SecureString& passphrase, WalletContext& context);
|
||||
} // namespace wallet
|
||||
|
||||
#endif // BITCOIN_WALLET_WALLET_H
|
||||
|
Loading…
Reference in New Issue
Block a user