diff --git a/src/.clang-tidy b/src/.clang-tidy index 1cf270833a2..22ce65e3b96 100644 --- a/src/.clang-tidy +++ b/src/.clang-tidy @@ -22,6 +22,7 @@ performance-*, -performance-no-int-to-ptr, -performance-noexcept-move-constructor, -performance-unnecessary-value-param, +readability-avoid-const-params-in-decls, readability-const-return-type, readability-redundant-declaration, readability-redundant-string-init, diff --git a/src/addrman.h b/src/addrman.h index 2ddf1468624..c425a114f7c 100644 --- a/src/addrman.h +++ b/src/addrman.h @@ -172,7 +172,7 @@ public: * * @return A vector of randomly selected addresses from vRandom. */ - std::vector GetAddr(size_t max_addresses, size_t max_pct, std::optional network, const bool filtered = true) const; + std::vector GetAddr(size_t max_addresses, size_t max_pct, std::optional network, bool filtered = true) const; /** * Returns an information-location pair for all addresses in the selected addrman table. diff --git a/src/addrman_impl.h b/src/addrman_impl.h index a0390b71545..93c178baebd 100644 --- a/src/addrman_impl.h +++ b/src/addrman_impl.h @@ -135,7 +135,7 @@ public: std::pair Select(bool new_only, const std::unordered_set& networks) const EXCLUSIVE_LOCKS_REQUIRED(!cs); - std::vector GetAddr(size_t max_addresses, size_t max_pct, std::optional network, const bool filtered = true) const + std::vector GetAddr(size_t max_addresses, size_t max_pct, std::optional network, bool filtered = true) const EXCLUSIVE_LOCKS_REQUIRED(!cs); std::vector> GetEntries(bool from_tried) const @@ -267,7 +267,7 @@ private: * */ nid_type GetEntry(bool use_tried, size_t bucket, size_t position) const EXCLUSIVE_LOCKS_REQUIRED(cs); - std::vector GetAddr_(size_t max_addresses, size_t max_pct, std::optional network, const bool filtered = true) const EXCLUSIVE_LOCKS_REQUIRED(cs); + std::vector GetAddr_(size_t max_addresses, size_t max_pct, std::optional network, bool filtered = true) const EXCLUSIVE_LOCKS_REQUIRED(cs); std::vector> GetEntries_(bool from_tried) const EXCLUSIVE_LOCKS_REQUIRED(cs); diff --git a/src/blockencodings.h b/src/blockencodings.h index c92aa05e805..dd45fc490b3 100644 --- a/src/blockencodings.h +++ b/src/blockencodings.h @@ -114,7 +114,7 @@ public: /** * @param[in] nonce This should be randomly generated, and is used for the siphash secret key */ - CBlockHeaderAndShortTxIDs(const CBlock& block, const uint64_t nonce); + CBlockHeaderAndShortTxIDs(const CBlock& block, uint64_t nonce); uint64_t GetShortID(const Wtxid& wtxid) const; diff --git a/src/chainparams.h b/src/chainparams.h index 4743e022dbb..64ad8aa5738 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -15,7 +15,7 @@ class ArgsManager; /** * Creates and returns a std::unique_ptr of the chosen chain. */ -std::unique_ptr CreateChainParams(const ArgsManager& args, const ChainType chain); +std::unique_ptr CreateChainParams(const ArgsManager& args, ChainType chain); /** * Return the currently selected parameters. This won't change after app @@ -26,6 +26,6 @@ const CChainParams &Params(); /** * Sets the params returned by Params() to those for the given chain type. */ -void SelectParams(const ChainType chain); +void SelectParams(ChainType chain); #endif // BITCOIN_CHAINPARAMS_H diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h index adbd6a51746..f68bd114376 100644 --- a/src/chainparamsbase.h +++ b/src/chainparamsbase.h @@ -35,7 +35,7 @@ private: /** * Creates and returns a std::unique_ptr of the chosen chain. */ -std::unique_ptr CreateBaseChainParams(const ChainType chain); +std::unique_ptr CreateBaseChainParams(ChainType chain); /** *Set the arguments for chainparams @@ -49,7 +49,7 @@ void SetupChainParamsBaseOptions(ArgsManager& argsman); const CBaseChainParams& BaseParams(); /** Sets the params returned by Params() to those for the given chain. */ -void SelectBaseParams(const ChainType chain); +void SelectBaseParams(ChainType chain); /** List of possible chain / network names */ #define LIST_CHAIN_NAMES "main, test, testnet4, signet, regtest" diff --git a/src/common/bloom.h b/src/common/bloom.h index 4f7473d8ffc..8e0f661f750 100644 --- a/src/common/bloom.h +++ b/src/common/bloom.h @@ -61,7 +61,7 @@ public: * It should generally always be a random value (and is largely only exposed for unit testing) * nFlags should be one of the BLOOM_UPDATE_* enums (not _MASK) */ - CBloomFilter(const unsigned int nElements, const double nFPRate, const unsigned int nTweak, unsigned char nFlagsIn); + CBloomFilter(unsigned int nElements, double nFPRate, unsigned int nTweak, unsigned char nFlagsIn); CBloomFilter() : nHashFuncs(0), nTweak(0), nFlags(0) {} SERIALIZE_METHODS(CBloomFilter, obj) { READWRITE(obj.vData, obj.nHashFuncs, obj.nTweak, obj.nFlags); } @@ -108,7 +108,7 @@ public: class CRollingBloomFilter { public: - CRollingBloomFilter(const unsigned int nElements, const double nFPRate); + CRollingBloomFilter(unsigned int nElements, double nFPRate); void insert(Span vKey); bool contains(Span vKey) const; diff --git a/src/common/messages.h b/src/common/messages.h index 5827fccee08..74aa60695dc 100644 --- a/src/common/messages.h +++ b/src/common/messages.h @@ -30,7 +30,7 @@ std::string FeeModeInfo(std::pair& mode); std::string FeeModesDetail(std::string default_info); std::string InvalidEstimateModeErrorMessage(); bilingual_str PSBTErrorString(PSBTError error); -bilingual_str TransactionErrorString(const node::TransactionError error); +bilingual_str TransactionErrorString(node::TransactionError error); bilingual_str ResolveErrMsg(const std::string& optname, const std::string& strBind); bilingual_str InvalidPortErrMsg(const std::string& optname, const std::string& strPort); bilingual_str AmountHighWarn(const std::string& optname); diff --git a/src/common/signmessage.h b/src/common/signmessage.h index 215b563bbb2..beadf3c504b 100644 --- a/src/common/signmessage.h +++ b/src/common/signmessage.h @@ -72,6 +72,6 @@ bool MessageSign( */ uint256 MessageHash(const std::string& message); -std::string SigningResultString(const SigningResult res); +std::string SigningResultString(SigningResult res); #endif // BITCOIN_COMMON_SIGNMESSAGE_H diff --git a/src/core_io.h b/src/core_io.h index ce2e8f67128..2e9f70924e4 100644 --- a/src/core_io.h +++ b/src/core_io.h @@ -33,7 +33,7 @@ enum class TxVerbosity { // core_read.cpp CScript ParseScript(const std::string& s); -std::string ScriptToAsmStr(const CScript& script, const bool fAttemptSighashDecode = false); +std::string ScriptToAsmStr(const CScript& script, bool fAttemptSighashDecode = false); [[nodiscard]] bool DecodeHexTx(CMutableTransaction& tx, const std::string& hex_tx, bool try_no_witness = false, bool try_witness = true); [[nodiscard]] bool DecodeHexBlk(CBlock&, const std::string& strHexBlk); bool DecodeHexBlockHeader(CBlockHeader&, const std::string& hex_header); @@ -41,7 +41,7 @@ bool DecodeHexBlockHeader(CBlockHeader&, const std::string& hex_header); [[nodiscard]] util::Result SighashFromStr(const std::string& sighash); // core_write.cpp -UniValue ValueFromAmount(const CAmount amount); +UniValue ValueFromAmount(CAmount amount); std::string FormatScript(const CScript& script); std::string EncodeHexTx(const CTransaction& tx); std::string SighashToStr(unsigned char sighash_type); diff --git a/src/crypto/hex_base.h b/src/crypto/hex_base.h index cdfea68c29c..60f94d50323 100644 --- a/src/crypto/hex_base.h +++ b/src/crypto/hex_base.h @@ -14,7 +14,7 @@ /** * Convert a span of bytes to a lower-case hexadecimal string. */ -std::string HexStr(const Span s); +std::string HexStr(Span s); inline std::string HexStr(const Span s) { return HexStr(MakeUCharSpan(s)); } inline std::string HexStr(const Span s) { return HexStr(MakeUCharSpan(s)); } diff --git a/src/deploymentinfo.h b/src/deploymentinfo.h index 72ba297ea0b..6d7b25562d3 100644 --- a/src/deploymentinfo.h +++ b/src/deploymentinfo.h @@ -27,6 +27,6 @@ inline std::string DeploymentName(Consensus::DeploymentPos pos) return VersionBitsDeploymentInfo[pos].name; } -std::optional GetBuriedDeployment(const std::string_view deployment_name); +std::optional GetBuriedDeployment(std::string_view deployment_name); #endif // BITCOIN_DEPLOYMENTINFO_H diff --git a/src/external_signer.cpp b/src/external_signer.cpp index 1810f45bc86..a083859bc37 100644 --- a/src/external_signer.cpp +++ b/src/external_signer.cpp @@ -15,14 +15,15 @@ #include #include -ExternalSigner::ExternalSigner(const std::string& command, const std::string chain, const std::string& fingerprint, const std::string name): m_command(command), m_chain(chain), m_fingerprint(fingerprint), m_name(name) {} +ExternalSigner::ExternalSigner(std::string command, std::string chain, std::string fingerprint, std::string name) + : m_command{std::move(command)}, m_chain{std::move(chain)}, m_fingerprint{std::move(fingerprint)}, m_name{std::move(name)} {} std::string ExternalSigner::NetworkArg() const { return " --chain " + m_chain; } -bool ExternalSigner::Enumerate(const std::string& command, std::vector& signers, const std::string chain) +bool ExternalSigner::Enumerate(const std::string& command, std::vector& signers, const std::string& chain) { // Call enumerate const UniValue result = RunCommandParseJSON(command + " enumerate"); diff --git a/src/external_signer.h b/src/external_signer.h index 81a601811a6..b3871a46409 100644 --- a/src/external_signer.h +++ b/src/external_signer.h @@ -31,7 +31,7 @@ public: //! @param[in] fingerprint master key fingerprint of the signer //! @param[in] chain "main", "test", "regtest" or "signet" //! @param[in] name device name - ExternalSigner(const std::string& command, const std::string chain, const std::string& fingerprint, const std::string name); + ExternalSigner(std::string command, std::string chain, std::string fingerprint, std::string name); //! Master key fingerprint of the signer std::string m_fingerprint; @@ -44,7 +44,7 @@ public: //! @param[in,out] signers vector to which new signers (with a unique master key fingerprint) are added //! @param chain "main", "test", "regtest" or "signet" //! @returns success - static bool Enumerate(const std::string& command, std::vector& signers, const std::string chain); + static bool Enumerate(const std::string& command, std::vector& signers, const std::string& chain); //! Display address on the device. Calls ` displayaddress --desc `. //! @param[in] descriptor Descriptor specifying which address to display. @@ -55,7 +55,7 @@ public: //! Calls ` getdescriptors --account ` //! @param[in] account which BIP32 account to use (e.g. `m/44'/0'/account'`) //! @returns see doc/external-signer.md - UniValue GetDescriptors(const int account); + UniValue GetDescriptors(int account); //! Sign PartiallySignedTransaction on the device. //! Calls ` signtransaction` and passes the PSBT via stdin. diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h index df1ced48a71..bcf8ba0206c 100644 --- a/src/interfaces/wallet.h +++ b/src/interfaces/wallet.h @@ -96,7 +96,7 @@ public: virtual std::string getWalletName() = 0; // Get a new address. - virtual util::Result getNewDestination(const OutputType type, const std::string& label) = 0; + virtual util::Result getNewDestination(OutputType type, const std::string& label) = 0; //! Get public key. virtual bool getPubKey(const CScript& script, const CKeyID& address, CPubKey& pub_key) = 0; @@ -135,7 +135,7 @@ public: virtual util::Result displayAddress(const CTxDestination& dest) = 0; //! Lock coin. - virtual bool lockCoin(const COutPoint& output, const bool write_to_db) = 0; + virtual bool lockCoin(const COutPoint& output, bool write_to_db) = 0; //! Unlock coin. virtual bool unlockCoin(const COutPoint& output) = 0; diff --git a/src/net.h b/src/net.h index e64d9a67f46..1e1265e0426 100644 --- a/src/net.h +++ b/src/net.h @@ -414,7 +414,7 @@ private: size_t m_bytes_sent GUARDED_BY(m_send_mutex) {0}; public: - explicit V1Transport(const NodeId node_id) noexcept; + explicit V1Transport(NodeId node_id) noexcept; bool ReceivedMessageComplete() const override EXCLUSIVE_LOCKS_REQUIRED(!m_recv_mutex) { @@ -1175,7 +1175,7 @@ public: * @param[in] network Select only addresses of this network (nullopt = all). * @param[in] filtered Select only addresses that are considered high quality (false = all). */ - std::vector GetAddresses(size_t max_addresses, size_t max_pct, std::optional network, const bool filtered = true) const; + std::vector GetAddresses(size_t max_addresses, size_t max_pct, std::optional network, bool filtered = true) const; /** * Cache is used to minimize topology leaks, so it should * be used for all non-trusted calls, for example, p2p. diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 3f6d0f3e42b..963d787bd0e 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -514,7 +514,7 @@ public: }; void UnitTestMisbehaving(NodeId peer_id) override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex) { Misbehaving(*Assert(GetPeerRef(peer_id)), ""); }; void ProcessMessage(CNode& pfrom, const std::string& msg_type, DataStream& vRecv, - const std::chrono::microseconds time_received, const std::atomic& interruptMsgProc) override + std::chrono::microseconds time_received, const std::atomic& interruptMsgProc) override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_most_recent_block_mutex, !m_headers_presync_mutex, g_msgproc_mutex, !m_tx_download_mutex); void UpdateLastBlockAnnounceTime(NodeId node, int64_t time_in_seconds) override; ServiceFlags GetDesirableServiceFlags(ServiceFlags services) const override; diff --git a/src/net_processing.h b/src/net_processing.h index 0d2dc59c5ae..de3fa6e5d0c 100644 --- a/src/net_processing.h +++ b/src/net_processing.h @@ -125,7 +125,7 @@ public: /** Process a single message from a peer. Public for fuzz testing */ virtual void ProcessMessage(CNode& pfrom, const std::string& msg_type, DataStream& vRecv, - const std::chrono::microseconds time_received, const std::atomic& interruptMsgProc) EXCLUSIVE_LOCKS_REQUIRED(g_msgproc_mutex) = 0; + std::chrono::microseconds time_received, const std::atomic& interruptMsgProc) EXCLUSIVE_LOCKS_REQUIRED(g_msgproc_mutex) = 0; /** This function is used for testing the stale tip eviction logic, see denialofservice_tests.cpp */ virtual void UpdateLastBlockAnnounceTime(NodeId node, int64_t time_in_seconds) = 0; diff --git a/src/netaddress.h b/src/netaddress.h index ad83c5381c3..ebc2f8221d9 100644 --- a/src/netaddress.h +++ b/src/netaddress.h @@ -205,7 +205,7 @@ public: std::vector GetAddrBytes() const; int GetReachabilityFrom(const CNetAddr& paddrPartner) const; - explicit CNetAddr(const struct in6_addr& pipv6Addr, const uint32_t scope = 0); + explicit CNetAddr(const struct in6_addr& pipv6Addr, uint32_t scope = 0); bool GetIn6Addr(struct in6_addr* pipv6Addr) const; friend bool operator==(const CNetAddr& a, const CNetAddr& b); diff --git a/src/node/blockstorage.h b/src/node/blockstorage.h index 665c2ccd834..025b8c6f92d 100644 --- a/src/node/blockstorage.h +++ b/src/node/blockstorage.h @@ -316,7 +316,7 @@ public: CBlockIndex* InsertBlockIndex(const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main); //! Mark one block file as pruned (modify associated database entries) - void PruneOneBlockFile(const int fileNumber) EXCLUSIVE_LOCKS_REQUIRED(cs_main); + void PruneOneBlockFile(int fileNumber) EXCLUSIVE_LOCKS_REQUIRED(cs_main); CBlockIndex* LookupBlockIndex(const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main); const CBlockIndex* LookupBlockIndex(const uint256& hash) const EXCLUSIVE_LOCKS_REQUIRED(cs_main); diff --git a/src/node/transaction.h b/src/node/transaction.h index 5f524f4e28e..b6dfa8c2857 100644 --- a/src/node/transaction.h +++ b/src/node/transaction.h @@ -63,7 +63,7 @@ static const CAmount DEFAULT_MAX_BURN_AMOUNT{0}; * @param[out] hashBlock The block hash, if the tx was found via -txindex or block_index * @returns The tx if found, otherwise nullptr */ -CTransactionRef GetTransaction(const CBlockIndex* const block_index, const CTxMemPool* const mempool, const uint256& hash, uint256& hashBlock, const BlockManager& blockman); +CTransactionRef GetTransaction(const CBlockIndex* block_index, const CTxMemPool* mempool, const uint256& hash, uint256& hashBlock, const BlockManager& blockman); } // namespace node #endif // BITCOIN_NODE_TRANSACTION_H diff --git a/src/policy/fees.h b/src/policy/fees.h index a95cc19dd45..b0b2a5c78f4 100644 --- a/src/policy/fees.h +++ b/src/policy/fees.h @@ -199,7 +199,7 @@ private: const fs::path m_estimation_filepath; public: /** Create new BlockPolicyEstimator and initialize stats tracking classes with default values */ - CBlockPolicyEstimator(const fs::path& estimation_filepath, const bool read_stale_estimates); + CBlockPolicyEstimator(const fs::path& estimation_filepath, bool read_stale_estimates); virtual ~CBlockPolicyEstimator(); /** Process all the transactions that have been included in a block */ diff --git a/src/psbt.cpp b/src/psbt.cpp index 19d855e4c78..977ada71438 100644 --- a/src/psbt.cpp +++ b/src/psbt.cpp @@ -295,7 +295,7 @@ bool PSBTInputSigned(const PSBTInput& input) return !input.final_script_sig.empty() || !input.final_script_witness.IsNull(); } -bool PSBTInputSignedAndVerified(const PartiallySignedTransaction psbt, unsigned int input_index, const PrecomputedTransactionData* txdata) +bool PSBTInputSignedAndVerified(const PartiallySignedTransaction& psbt, unsigned int input_index, const PrecomputedTransactionData* txdata) { CTxOut utxo; assert(psbt.inputs.size() >= input_index); diff --git a/src/psbt.h b/src/psbt.h index 6d49864b3cd..60e7df9d152 100644 --- a/src/psbt.h +++ b/src/psbt.h @@ -1229,7 +1229,7 @@ PrecomputedTransactionData PrecomputePSBTData(const PartiallySignedTransaction& bool PSBTInputSigned(const PSBTInput& input); /** Checks whether a PSBTInput is already signed by doing script verification using final fields. */ -bool PSBTInputSignedAndVerified(const PartiallySignedTransaction psbt, unsigned int input_index, const PrecomputedTransactionData* txdata); +bool PSBTInputSignedAndVerified(const PartiallySignedTransaction& psbt, unsigned int input_index, const PrecomputedTransactionData* txdata); /** Signs a PSBTInput, verifying that all provided data matches what is being signed. * diff --git a/src/qt/addresstablemodel.h b/src/qt/addresstablemodel.h index 44808364ec9..877b01d882f 100644 --- a/src/qt/addresstablemodel.h +++ b/src/qt/addresstablemodel.h @@ -70,7 +70,7 @@ public: /* Add an address to the model. Returns the added address on success, and an empty string otherwise. */ - QString addRow(const QString &type, const QString &label, const QString &address, const OutputType address_type); + QString addRow(const QString& type, const QString& label, const QString& address, OutputType address_type); /** Look up label for address in address book, if not found return empty string. */ QString labelForAddress(const QString &address) const; diff --git a/src/qt/networkstyle.h b/src/qt/networkstyle.h index dd2aee3eb38..f3c4f98facf 100644 --- a/src/qt/networkstyle.h +++ b/src/qt/networkstyle.h @@ -16,7 +16,7 @@ class NetworkStyle { public: /** Get style associated with provided network id, or 0 if not known */ - static const NetworkStyle* instantiate(const ChainType networkId); + static const NetworkStyle* instantiate(ChainType networkId); const QString &getAppName() const { return appName; } const QIcon &getAppIcon() const { return appIcon; } @@ -24,7 +24,7 @@ public: const QString &getTitleAddText() const { return titleAddText; } private: - NetworkStyle(const QString &appName, const int iconColorHueShift, const int iconColorSaturationReduction, const char *titleAddText); + NetworkStyle(const QString& appName, int iconColorHueShift, int iconColorSaturationReduction, const char* titleAddText); QString appName; QIcon appIcon; diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h index 894ecb1fdf5..6016affd5a7 100644 --- a/src/qt/rpcconsole.h +++ b/src/qt/rpcconsole.h @@ -46,7 +46,7 @@ public: explicit RPCConsole(interfaces::Node& node, const PlatformStyle *platformStyle, QWidget *parent); ~RPCConsole(); - static bool RPCParseCommandLine(interfaces::Node* node, std::string &strResult, const std::string &strCommand, bool fExecute, std::string * const pstrFilteredOut = nullptr, const WalletModel* wallet_model = nullptr); + static bool RPCParseCommandLine(interfaces::Node* node, std::string& strResult, const std::string& strCommand, bool fExecute, std::string* pstrFilteredOut = nullptr, const WalletModel* wallet_model = nullptr); static bool RPCExecuteCommandLine(interfaces::Node& node, std::string &strResult, const std::string &strCommand, std::string * const pstrFilteredOut = nullptr, const WalletModel* wallet_model = nullptr) { return RPCParseCommandLine(&node, strResult, strCommand, true, pstrFilteredOut, wallet_model); } @@ -54,8 +54,8 @@ public: void setClientModel(ClientModel *model = nullptr, int bestblock_height = 0, int64_t bestblock_date = 0, double verification_progress = 0.0); #ifdef ENABLE_WALLET - void addWallet(WalletModel* const walletModel); - void removeWallet(WalletModel* const walletModel); + void addWallet(WalletModel* walletModel); + void removeWallet(WalletModel* walletModel); #endif // ENABLE_WALLET enum MessageClass { @@ -136,7 +136,7 @@ public Q_SLOTS: void setTabFocus(enum TabTypes tabType); #ifdef ENABLE_WALLET /** Set the current (ie - active) wallet */ - void setCurrentWallet(WalletModel* const wallet_model); + void setCurrentWallet(WalletModel* wallet_model); #endif // ENABLE_WALLET private: diff --git a/src/random.h b/src/random.h index 203678b17c6..da325341243 100644 --- a/src/random.h +++ b/src/random.h @@ -95,7 +95,7 @@ void RandAddPeriodic() noexcept; * * Thread-safe. */ -void RandAddEvent(const uint32_t event_info) noexcept; +void RandAddEvent(uint32_t event_info) noexcept; /* =========================== BASE RANDOMNESS GENERATION FUNCTIONS =========================== diff --git a/src/rpc/util.h b/src/rpc/util.h index 4eafa1eb6e4..346ffd89c88 100644 --- a/src/rpc/util.h +++ b/src/rpc/util.h @@ -133,7 +133,7 @@ std::string HelpExampleRpcNamed(const std::string& methodname, const RPCArgList& CPubKey HexToPubKey(const std::string& hex_in); CPubKey AddrToPubKey(const FillableSigningProvider& keystore, const std::string& addr_in); -CTxDestination AddAndGetMultisigDestination(const int required, const std::vector& pubkeys, OutputType type, FlatSigningProvider& keystore, CScript& script_out); +CTxDestination AddAndGetMultisigDestination(int required, const std::vector& pubkeys, OutputType type, FlatSigningProvider& keystore, CScript& script_out); UniValue DescribeAddress(const CTxDestination& dest); @@ -151,7 +151,7 @@ UniValue JSONRPCTransactionError(node::TransactionError terr, const std::string& std::pair ParseDescriptorRange(const UniValue& value); /** Evaluate a descriptor given as a string, or as a {"desc":...,"range":...} object, with default range of 1000. */ -std::vector EvalDescriptorStringOrObject(const UniValue& scanobject, FlatSigningProvider& provider, const bool expand_priv = false); +std::vector EvalDescriptorStringOrObject(const UniValue& scanobject, FlatSigningProvider& provider, bool expand_priv = false); /** * Serializing JSON objects depends on the outer type. Only arrays and @@ -369,7 +369,7 @@ struct RPCResult { : RPCResult{type, std::move(m_key_name), /*optional=*/false, std::move(description), std::move(inner), skip_type_check} {} /** Append the sections of the result. */ - void ToSections(Sections& sections, OuterType outer_type = OuterType::NONE, const int current_indent = 0) const; + void ToSections(Sections& sections, OuterType outer_type = OuterType::NONE, int current_indent = 0) const; /** Return the type string of the result when it is in an object (dict). */ std::string ToStringObj() const; /** Return the description string, including the result type. */ diff --git a/src/script/miniscript.h b/src/script/miniscript.h index 03f0a7c3654..f21422a38fd 100644 --- a/src/script/miniscript.h +++ b/src/script/miniscript.h @@ -1744,7 +1744,7 @@ enum class ParseContext { CLOSE_BRACKET, }; -int FindNextChar(Span in, const char m); +int FindNextChar(Span in, char m); /** Parse a key string ending at the end of the fragment's text representation. */ template diff --git a/src/script/script_error.h b/src/script/script_error.h index 44e68fe0fae..06abe32d7fe 100644 --- a/src/script/script_error.h +++ b/src/script/script_error.h @@ -87,6 +87,6 @@ typedef enum ScriptError_t #define SCRIPT_ERR_LAST SCRIPT_ERR_ERROR_COUNT -std::string ScriptErrorString(const ScriptError error); +std::string ScriptErrorString(ScriptError error); #endif // BITCOIN_SCRIPT_SCRIPT_ERROR_H diff --git a/src/script/sigcache.h b/src/script/sigcache.h index 76802e6a7cc..6261bb9b075 100644 --- a/src/script/sigcache.h +++ b/src/script/sigcache.h @@ -55,7 +55,7 @@ public: void ComputeEntrySchnorr(uint256& entry, const uint256 &hash, Span sig, const XOnlyPubKey& pubkey) const; - bool Get(const uint256& entry, const bool erase); + bool Get(const uint256& entry, bool erase); void Set(const uint256& entry); }; diff --git a/src/test/fuzz/util.h b/src/test/fuzz/util.h index 38be59fb64b..470f9b1453c 100644 --- a/src/test/fuzz/util.h +++ b/src/test/fuzz/util.h @@ -146,11 +146,11 @@ template [[nodiscard]] int64_t ConsumeTime(FuzzedDataProvider& fuzzed_data_provider, const std::optional& min = std::nullopt, const std::optional& max = std::nullopt) noexcept; -[[nodiscard]] CMutableTransaction ConsumeTransaction(FuzzedDataProvider& fuzzed_data_provider, const std::optional>& prevout_txids, const int max_num_in = 10, const int max_num_out = 10) noexcept; +[[nodiscard]] CMutableTransaction ConsumeTransaction(FuzzedDataProvider& fuzzed_data_provider, const std::optional>& prevout_txids, int max_num_in = 10, int max_num_out = 10) noexcept; -[[nodiscard]] CScriptWitness ConsumeScriptWitness(FuzzedDataProvider& fuzzed_data_provider, const size_t max_stack_elem_size = 32) noexcept; +[[nodiscard]] CScriptWitness ConsumeScriptWitness(FuzzedDataProvider& fuzzed_data_provider, size_t max_stack_elem_size = 32) noexcept; -[[nodiscard]] CScript ConsumeScript(FuzzedDataProvider& fuzzed_data_provider, const bool maybe_p2wsh = false) noexcept; +[[nodiscard]] CScript ConsumeScript(FuzzedDataProvider& fuzzed_data_provider, bool maybe_p2wsh = false) noexcept; [[nodiscard]] uint32_t ConsumeSequence(FuzzedDataProvider& fuzzed_data_provider) noexcept; diff --git a/src/test/fuzz/util/descriptor.h b/src/test/fuzz/util/descriptor.h index ea928c39f04..1408f9c58f4 100644 --- a/src/test/fuzz/util/descriptor.h +++ b/src/test/fuzz/util/descriptor.h @@ -53,7 +53,7 @@ constexpr int MAX_DEPTH{2}; * Whether the buffer, if it represents a valid descriptor, contains a derivation path deeper than * a given maximum depth. Note this may also be hit for deriv paths in origins. */ -bool HasDeepDerivPath(const FuzzBufferType& buff, const int max_depth = MAX_DEPTH); +bool HasDeepDerivPath(const FuzzBufferType& buff, int max_depth = MAX_DEPTH); //! Default maximum number of sub-fragments. constexpr int MAX_SUBS{1'000}; @@ -64,8 +64,8 @@ constexpr size_t MAX_NESTED_SUBS{10'000}; * Whether the buffer, if it represents a valid descriptor, contains a fragment with more * sub-fragments than the given maximum. */ -bool HasTooManySubFrag(const FuzzBufferType& buff, const int max_subs = MAX_SUBS, - const size_t max_nested_subs = MAX_NESTED_SUBS); +bool HasTooManySubFrag(const FuzzBufferType& buff, int max_subs = MAX_SUBS, + size_t max_nested_subs = MAX_NESTED_SUBS); //! Default maximum number of wrappers per fragment. constexpr int MAX_WRAPPERS{100}; @@ -74,6 +74,6 @@ constexpr int MAX_WRAPPERS{100}; * Whether the buffer, if it represents a valid descriptor, contains a fragment with more * wrappers than the given maximum. */ -bool HasTooManyWrappers(const FuzzBufferType& buff, const int max_wrappers = MAX_WRAPPERS); +bool HasTooManyWrappers(const FuzzBufferType& buff, int max_wrappers = MAX_WRAPPERS); #endif // BITCOIN_TEST_FUZZ_UTIL_DESCRIPTOR_H diff --git a/src/test/headers_sync_chainwork_tests.cpp b/src/test/headers_sync_chainwork_tests.cpp index b710ad1801e..0da073fd5de 100644 --- a/src/test/headers_sync_chainwork_tests.cpp +++ b/src/test/headers_sync_chainwork_tests.cpp @@ -22,8 +22,8 @@ struct HeadersGeneratorSetup : public RegTestingSetup { * prev_time, and with a fixed merkle root hash. */ void GenerateHeaders(std::vector& headers, size_t count, - const uint256& starting_hash, const int nVersion, int prev_time, - const uint256& merkle_root, const uint32_t nBits); + const uint256& starting_hash, int nVersion, int prev_time, + const uint256& merkle_root, uint32_t nBits); }; void HeadersGeneratorSetup::FindProofOfWork(CBlockHeader& starting_header) diff --git a/src/test/util/setup_common.h b/src/test/util/setup_common.h index 57bea9086b9..52d7bd0efc1 100644 --- a/src/test/util/setup_common.h +++ b/src/test/util/setup_common.h @@ -73,7 +73,7 @@ struct BasicTestingSetup { m_rng.Reseed(GetRandHash()); } - explicit BasicTestingSetup(const ChainType chainType = ChainType::MAIN, TestOpts = {}); + explicit BasicTestingSetup(ChainType chainType = ChainType::MAIN, TestOpts = {}); ~BasicTestingSetup(); fs::path m_path_root; @@ -109,7 +109,7 @@ struct ChainTestingSetup : public BasicTestingSetup { bool m_block_tree_db_in_memory{true}; std::function m_make_chainman{}; - explicit ChainTestingSetup(const ChainType chainType = ChainType::MAIN, TestOpts = {}); + explicit ChainTestingSetup(ChainType chainType = ChainType::MAIN, TestOpts = {}); ~ChainTestingSetup(); // Supplies a chainstate, if one is needed @@ -120,7 +120,7 @@ struct ChainTestingSetup : public BasicTestingSetup { */ struct TestingSetup : public ChainTestingSetup { explicit TestingSetup( - const ChainType chainType = ChainType::MAIN, + ChainType chainType = ChainType::MAIN, TestOpts = {}); }; @@ -145,7 +145,7 @@ class CScript; */ struct TestChain100Setup : public TestingSetup { TestChain100Setup( - const ChainType chain_type = ChainType::REGTEST, + ChainType chain_type = ChainType::REGTEST, TestOpts = {}); /** diff --git a/src/test/validation_block_tests.cpp b/src/test/validation_block_tests.cpp index 5c1f195868b..f3b9ff36e33 100644 --- a/src/test/validation_block_tests.cpp +++ b/src/test/validation_block_tests.cpp @@ -27,7 +27,7 @@ struct MinerTestingSetup : public RegTestingSetup { std::shared_ptr GoodBlock(const uint256& prev_hash); std::shared_ptr BadBlock(const uint256& prev_hash); std::shared_ptr FinalizeBlock(std::shared_ptr pblock); - void BuildChain(const uint256& root, int height, const unsigned int invalid_rate, const unsigned int branch_rate, const unsigned int max_size, std::vector>& blocks); + void BuildChain(const uint256& root, int height, unsigned int invalid_rate, unsigned int branch_rate, unsigned int max_size, std::vector>& blocks); }; } // namespace validation_block_tests diff --git a/src/txmempool.h b/src/txmempool.h index 10acb2aa22f..3f7e6ace778 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -681,7 +681,7 @@ public: }; /** Removes a transaction from the unbroadcast set */ - void RemoveUnbroadcastTx(const uint256& txid, const bool unchecked = false); + void RemoveUnbroadcastTx(const uint256& txid, bool unchecked = false); /** Returns transactions in unbroadcast set */ std::set GetUnbroadcastTxs() const @@ -829,7 +829,7 @@ public: using TxHandle = CTxMemPool::txiter; - TxHandle StageAddition(const CTransactionRef& tx, const CAmount fee, int64_t time, unsigned int entry_height, uint64_t entry_sequence, bool spends_coinbase, int64_t sigops_cost, LockPoints lp); + TxHandle StageAddition(const CTransactionRef& tx, CAmount fee, int64_t time, unsigned int entry_height, uint64_t entry_sequence, bool spends_coinbase, int64_t sigops_cost, LockPoints lp); void StageRemoval(CTxMemPool::txiter it) { m_to_remove.insert(it); } const CTxMemPool::setEntries& GetRemovals() const { return m_to_remove; } diff --git a/src/util/moneystr.h b/src/util/moneystr.h index dba0ce676a9..a6787bff03d 100644 --- a/src/util/moneystr.h +++ b/src/util/moneystr.h @@ -17,7 +17,7 @@ /* Do not use these functions to represent or parse monetary amounts to or from * JSON but use AmountFromValue and ValueFromAmount for that. */ -std::string FormatMoney(const CAmount n); +std::string FormatMoney(CAmount n); /** Parse an amount denoted in full coins. E.g. "0.0034" supplied on the command line. **/ std::optional ParseMoney(const std::string& str); diff --git a/src/wallet/bdb.h b/src/wallet/bdb.h index f3fe8a19c19..8551d8faf32 100644 --- a/src/wallet/bdb.h +++ b/src/wallet/bdb.h @@ -194,7 +194,7 @@ protected: BerkeleyDatabase& m_database; public: - explicit BerkeleyBatch(BerkeleyDatabase& database, const bool fReadOnly, bool fFlushOnCloseIn=true); + explicit BerkeleyBatch(BerkeleyDatabase& database, bool fReadOnly, bool fFlushOnCloseIn = true); ~BerkeleyBatch() override; BerkeleyBatch(const BerkeleyBatch&) = delete; diff --git a/src/wallet/coinselection.h b/src/wallet/coinselection.h index 08889c8e060..e029f394300 100644 --- a/src/wallet/coinselection.h +++ b/src/wallet/coinselection.h @@ -308,7 +308,7 @@ typedef std::map FilteredOutputGroups * @param[in] payment_value Average payment value of the transaction output(s). * @param[in] change_fee Fee for creating a change output. */ -[[nodiscard]] CAmount GenerateChangeTarget(const CAmount payment_value, const CAmount change_fee, FastRandomContext& rng); +[[nodiscard]] CAmount GenerateChangeTarget(CAmount payment_value, CAmount change_fee, FastRandomContext& rng); enum class SelectionAlgorithm : uint8_t { @@ -319,7 +319,7 @@ enum class SelectionAlgorithm : uint8_t MANUAL = 4, }; -std::string GetAlgorithmName(const SelectionAlgorithm algo); +std::string GetAlgorithmName(SelectionAlgorithm algo); struct SelectionResult { @@ -373,7 +373,7 @@ public: void AddInputs(const std::set>& inputs, bool subtract_fee_outputs); /** How much individual inputs overestimated the bump fees for shared ancestries */ - void SetBumpFeeDiscount(const CAmount discount); + void SetBumpFeeDiscount(CAmount discount); /** Calculates and stores the waste for this result given the cost of change * and the opportunity cost of spending these inputs now vs in the future. @@ -387,7 +387,7 @@ public: * used if there is change, in which case it must be non-negative. * @param[in] change_fee The fee for creating a change output */ - void RecalculateWaste(const CAmount min_viable_change, const CAmount change_cost, const CAmount change_fee); + void RecalculateWaste(CAmount min_viable_change, CAmount change_cost, CAmount change_fee); [[nodiscard]] CAmount GetWaste() const; /** Tracks that algorithm was able to exhaustively search the entire combination space before hitting limit of tries */ @@ -434,7 +434,7 @@ public: * @returns Amount for change output, 0 when there is no change. * */ - CAmount GetChange(const CAmount min_viable_change, const CAmount change_fee) const; + CAmount GetChange(CAmount min_viable_change, CAmount change_fee) const; CAmount GetTarget() const { return m_target; } diff --git a/src/wallet/crypter.h b/src/wallet/crypter.h index 944858fb3f8..48ef8e37fad 100644 --- a/src/wallet/crypter.h +++ b/src/wallet/crypter.h @@ -78,7 +78,7 @@ private: int BytesToKeySHA512AES(std::span salt, const SecureString& key_data, int count, unsigned char* key, unsigned char* iv) const; public: - bool SetKeyFromPassphrase(const SecureString& key_data, std::span salt, const unsigned int rounds, const unsigned int derivation_method); + bool SetKeyFromPassphrase(const SecureString& key_data, std::span salt, unsigned int rounds, unsigned int derivation_method); bool Encrypt(const CKeyingMaterial& vchPlaintext, std::vector &vchCiphertext) const; bool Decrypt(std::span ciphertext, CKeyingMaterial& plaintext) const; bool SetKey(const CKeyingMaterial& new_key, std::span new_iv); diff --git a/src/wallet/rpc/util.cpp b/src/wallet/rpc/util.cpp index 414f0deeb2d..3e1520b09ad 100644 --- a/src/wallet/rpc/util.cpp +++ b/src/wallet/rpc/util.cpp @@ -136,7 +136,7 @@ void PushParentDescriptors(const CWallet& wallet, const CScript& script_pubkey, entry.pushKV("parent_descs", std::move(parent_descs)); } -void HandleWalletError(const std::shared_ptr wallet, DatabaseStatus& status, bilingual_str& error) +void HandleWalletError(const std::shared_ptr& wallet, DatabaseStatus& status, bilingual_str& error) { if (!wallet) { // Map bad format to not found, since bad format is returned when the diff --git a/src/wallet/rpc/util.h b/src/wallet/rpc/util.h index 002d0355e50..dfa0b6ae967 100644 --- a/src/wallet/rpc/util.h +++ b/src/wallet/rpc/util.h @@ -50,7 +50,7 @@ std::string LabelFromValue(const UniValue& value); //! Fetch parent descriptors of this scriptPubKey. void PushParentDescriptors(const CWallet& wallet, const CScript& script_pubkey, UniValue& entry); -void HandleWalletError(const std::shared_ptr wallet, DatabaseStatus& status, bilingual_str& error); +void HandleWalletError(const std::shared_ptr& wallet, DatabaseStatus& status, bilingual_str& error); void AppendLastProcessedBlock(UniValue& entry, const CWallet& wallet) EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet); } // namespace wallet diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp index 04287581f5a..958e312c254 100644 --- a/src/wallet/scriptpubkeyman.cpp +++ b/src/wallet/scriptpubkeyman.cpp @@ -323,7 +323,7 @@ util::Result LegacyScriptPubKeyMan::GetReservedDestination(const return GetDestinationForKey(keypool.vchPubKey, type); } -bool LegacyScriptPubKeyMan::TopUpInactiveHDChain(const CKeyID seed_id, int64_t index, bool internal) +bool LegacyScriptPubKeyMan::TopUpInactiveHDChain(const CKeyID& seed_id, int64_t index, bool internal) { LOCK(cs_KeyStore); @@ -1601,7 +1601,7 @@ bool LegacyScriptPubKeyMan::AddKeyOriginWithDB(WalletBatch& batch, const CPubKey return batch.WriteKeyMetadata(mapKeyMetadata[pubkey.GetID()], pubkey, true); } -bool LegacyScriptPubKeyMan::ImportScripts(const std::set scripts, int64_t timestamp) +bool LegacyScriptPubKeyMan::ImportScripts(const std::set& scripts, int64_t timestamp) { WalletBatch batch(m_storage.GetDatabase()); for (const auto& entry : scripts) { diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h index 4dbb2838d71..91dfd354799 100644 --- a/src/wallet/scriptpubkeyman.h +++ b/src/wallet/scriptpubkeyman.h @@ -408,7 +408,7 @@ private: //! Adds a key to the store, and saves it to disk. bool AddKeyPubKeyWithDB(WalletBatch &batch,const CKey& key, const CPubKey &pubkey) EXCLUSIVE_LOCKS_REQUIRED(cs_KeyStore); - void AddKeypoolPubkeyWithDB(const CPubKey& pubkey, const bool internal, WalletBatch& batch); + void AddKeypoolPubkeyWithDB(const CPubKey& pubkey, bool internal, WalletBatch& batch); //! Adds a script to the store and saves it to disk bool AddCScriptWithDB(WalletBatch& batch, const CScript& script); @@ -423,7 +423,7 @@ private: std::map m_index_to_reserved_key; //! Fetches a key from the keypool - bool GetKeyFromPool(CPubKey &key, const OutputType type); + bool GetKeyFromPool(CPubKey& key, OutputType type); /** * Reserves a key from the keypool and sets nIndex to its index @@ -451,17 +451,17 @@ private: * * @return true if seed was found and keys were derived. false if unable to derive seeds */ - bool TopUpInactiveHDChain(const CKeyID seed_id, int64_t index, bool internal); + bool TopUpInactiveHDChain(const CKeyID& seed_id, int64_t index, bool internal); bool TopUpChain(WalletBatch& batch, CHDChain& chain, unsigned int size); public: LegacyScriptPubKeyMan(WalletStorage& storage, int64_t keypool_size) : LegacyDataSPKM(storage), m_keypool_size(keypool_size) {} - util::Result GetNewDestination(const OutputType type) override; + util::Result GetNewDestination(OutputType type) override; bool Encrypt(const CKeyingMaterial& master_key, WalletBatch* batch) override; - util::Result GetReservedDestination(const OutputType type, bool internal, int64_t& index, CKeyPool& keypool) override; + util::Result GetReservedDestination(OutputType type, bool internal, int64_t& index, CKeyPool& keypool) override; void KeepDestination(int64_t index, const OutputType& type) override; void ReturnDestination(int64_t index, bool internal, const CTxDestination&) override; @@ -523,10 +523,10 @@ public: bool NewKeyPool(); void MarkPreSplitKeys() EXCLUSIVE_LOCKS_REQUIRED(cs_KeyStore); - bool ImportScripts(const std::set scripts, int64_t timestamp) EXCLUSIVE_LOCKS_REQUIRED(cs_KeyStore); - bool ImportPrivKeys(const std::map& privkey_map, const int64_t timestamp) EXCLUSIVE_LOCKS_REQUIRED(cs_KeyStore); - bool ImportPubKeys(const std::vector>& ordered_pubkeys, const std::map& pubkey_map, const std::map>& key_origins, const bool add_keypool, const int64_t timestamp) EXCLUSIVE_LOCKS_REQUIRED(cs_KeyStore); - bool ImportScriptPubKeys(const std::set& script_pub_keys, const bool have_solving_data, const int64_t timestamp) EXCLUSIVE_LOCKS_REQUIRED(cs_KeyStore); + bool ImportScripts(const std::set& scripts, int64_t timestamp) EXCLUSIVE_LOCKS_REQUIRED(cs_KeyStore); + bool ImportPrivKeys(const std::map& privkey_map, int64_t timestamp) EXCLUSIVE_LOCKS_REQUIRED(cs_KeyStore); + bool ImportPubKeys(const std::vector>& ordered_pubkeys, const std::map& pubkey_map, const std::map>& key_origins, bool add_keypool, int64_t timestamp) EXCLUSIVE_LOCKS_REQUIRED(cs_KeyStore); + bool ImportScriptPubKeys(const std::set& script_pub_keys, bool have_solving_data, int64_t timestamp) EXCLUSIVE_LOCKS_REQUIRED(cs_KeyStore); /* Returns true if the wallet can generate new keys */ bool CanGenerateKeys() const; @@ -638,13 +638,13 @@ public: mutable RecursiveMutex cs_desc_man; - util::Result GetNewDestination(const OutputType type) override; + util::Result GetNewDestination(OutputType type) override; isminetype IsMine(const CScript& script) const override; bool CheckDecryptionKey(const CKeyingMaterial& master_key) override; bool Encrypt(const CKeyingMaterial& master_key, WalletBatch* batch) override; - util::Result GetReservedDestination(const OutputType type, bool internal, int64_t& index, CKeyPool& keypool) override; + util::Result GetReservedDestination(OutputType type, bool internal, int64_t& index, CKeyPool& keypool) override; void ReturnDestination(int64_t index, bool internal, const CTxDestination& addr) override; // Tops up the descriptor cache and m_map_script_pub_keys. The cache is stored in the wallet file @@ -704,7 +704,7 @@ public: std::unordered_set GetScriptPubKeys(int32_t minimum_index) const; int32_t GetEndRange() const; - [[nodiscard]] bool GetDescriptorString(std::string& out, const bool priv) const; + [[nodiscard]] bool GetDescriptorString(std::string& out, bool priv) const; void UpgradeDescriptorCache(); }; diff --git a/src/wallet/spend.h b/src/wallet/spend.h index 62a7b4e4c89..44129f35c3b 100644 --- a/src/wallet/spend.h +++ b/src/wallet/spend.h @@ -18,7 +18,7 @@ namespace wallet { /** Get the marginal bytes if spending the specified output from this transaction. * Use CoinControl to determine whether to expect signature grinding when calculating the size of the input spend. */ int CalculateMaximumSignedInputSize(const CTxOut& txout, const CWallet* pwallet, const CCoinControl* coin_control); -int CalculateMaximumSignedInputSize(const CTxOut& txout, const COutPoint outpoint, const SigningProvider* pwallet, bool can_grind_r, const CCoinControl* coin_control); +int CalculateMaximumSignedInputSize(const CTxOut& txout, COutPoint outpoint, const SigningProvider* pwallet, bool can_grind_r, const CCoinControl* coin_control); struct TxSize { int64_t vsize{-1}; int64_t weight{-1}; diff --git a/src/wallet/test/init_test_fixture.h b/src/wallet/test/init_test_fixture.h index ac7bb8997c3..ba0b75e16c2 100644 --- a/src/wallet/test/init_test_fixture.h +++ b/src/wallet/test/init_test_fixture.h @@ -14,7 +14,7 @@ namespace wallet { struct InitWalletDirTestingSetup: public BasicTestingSetup { - explicit InitWalletDirTestingSetup(const ChainType chain_type = ChainType::MAIN); + explicit InitWalletDirTestingSetup(ChainType chain_type = ChainType::MAIN); ~InitWalletDirTestingSetup(); void SetWalletDir(const fs::path& walletdir_path); diff --git a/src/wallet/test/wallet_test_fixture.h b/src/wallet/test/wallet_test_fixture.h index 4aae02e075a..0f5aab25a82 100644 --- a/src/wallet/test/wallet_test_fixture.h +++ b/src/wallet/test/wallet_test_fixture.h @@ -20,7 +20,7 @@ namespace wallet { /** Testing setup and teardown for wallet. */ struct WalletTestingSetup : public TestingSetup { - explicit WalletTestingSetup(const ChainType chainType = ChainType::MAIN); + explicit WalletTestingSetup(ChainType chainType = ChainType::MAIN); ~WalletTestingSetup(); std::unique_ptr m_wallet_loader; diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 09eda0c28e4..9e0f1c88683 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1778,7 +1778,7 @@ void CWallet::InitWalletFlags(uint64_t flags) if (!LoadWalletFlags(flags)) assert(false); } -bool CWallet::ImportScripts(const std::set scripts, int64_t timestamp) +bool CWallet::ImportScripts(const std::set& scripts, int64_t timestamp) { auto spk_man = GetLegacyScriptPubKeyMan(); if (!spk_man) { @@ -2583,7 +2583,7 @@ bool CWallet::TopUpKeyPool(unsigned int kpSize) return res; } -util::Result CWallet::GetNewDestination(const OutputType type, const std::string label) +util::Result CWallet::GetNewDestination(const OutputType type, const std::string& label) { LOCK(cs_wallet); auto spk_man = GetScriptPubKeyMan(type, /*internal=*/false); diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index c475718eb94..565b16e956d 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -433,7 +433,7 @@ private: * block locator and m_last_block_processed, and registering for * notifications about new blocks and transactions. */ - static bool AttachChain(const std::shared_ptr& wallet, interfaces::Chain& chain, const bool rescan_required, bilingual_str& error, std::vector& warnings); + static bool AttachChain(const std::shared_ptr& wallet, interfaces::Chain& chain, bool rescan_required, bilingual_str& error, std::vector& warnings); static NodeClock::time_point GetDefaultNextResend(); @@ -630,7 +630,7 @@ public: //! USER_ABORT. uint256 last_failed_block; }; - ScanResult ScanForWalletTransactions(const uint256& start_block, int start_height, std::optional max_height, const WalletRescanReserver& reserver, bool fUpdate, const bool save_progress); + ScanResult ScanForWalletTransactions(const uint256& start_block, int start_height, std::optional max_height, const WalletRescanReserver& reserver, bool fUpdate, bool save_progress); void transactionRemovedFromMempool(const CTransactionRef& tx, MemPoolRemovalReason reason) override; /** Set the next time this wallet should resend transactions to 12-36 hours from now, ~1 day on average. */ void SetNextResend() { m_next_resend = GetDefaultNextResend(); } @@ -684,10 +684,10 @@ public: bool SubmitTxMemoryPoolAndRelay(CWalletTx& wtx, std::string& err_string, bool relay) const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); - bool ImportScripts(const std::set scripts, int64_t timestamp) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); - bool ImportPrivKeys(const std::map& privkey_map, const int64_t timestamp) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); - bool ImportPubKeys(const std::vector>& ordered_pubkeys, const std::map& pubkey_map, const std::map>& key_origins, const bool add_keypool, const int64_t timestamp) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); - bool ImportScriptPubKeys(const std::string& label, const std::set& script_pub_keys, const bool have_solving_data, const bool apply_label, const int64_t timestamp) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); + bool ImportScripts(const std::set& scripts, int64_t timestamp) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); + bool ImportPrivKeys(const std::map& privkey_map, int64_t timestamp) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); + bool ImportPubKeys(const std::vector>& ordered_pubkeys, const std::map& pubkey_map, const std::map>& key_origins, bool add_keypool, int64_t timestamp) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); + bool ImportScriptPubKeys(const std::string& label, const std::set& script_pub_keys, bool have_solving_data, bool apply_label, int64_t timestamp) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); /** Updates wallet birth time if 'time' is below it */ void MaybeUpdateBirthTime(int64_t time); @@ -757,7 +757,7 @@ public: /** * Retrieve all the known labels in the address book */ - std::set ListAddrBookLabels(const std::optional purpose) const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); + std::set ListAddrBookLabels(std::optional purpose) const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); /** * Walk-through the address book entries. @@ -772,8 +772,8 @@ public: */ void MarkDestinationsDirty(const std::set& destinations) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); - util::Result GetNewDestination(const OutputType type, const std::string label); - util::Result GetNewChangeDestination(const OutputType type); + util::Result GetNewDestination(OutputType type, const std::string& label); + util::Result GetNewChangeDestination(OutputType type); isminetype IsMine(const CTxDestination& dest) const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); isminetype IsMine(const CScript& script) const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h index 70d69870126..be074c4d8a4 100644 --- a/src/wallet/walletdb.h +++ b/src/wallet/walletdb.h @@ -239,7 +239,7 @@ public: bool WriteTx(const CWalletTx& wtx); bool EraseTx(uint256 hash); - bool WriteKeyMetadata(const CKeyMetadata& meta, const CPubKey& pubkey, const bool overwrite); + bool WriteKeyMetadata(const CKeyMetadata& meta, const CPubKey& pubkey, bool overwrite); bool WriteKey(const CPubKey& vchPubKey, const CPrivKey& vchPrivKey, const CKeyMetadata &keyMeta); bool WriteCryptedKey(const CPubKey& vchPubKey, const std::vector& vchCryptedSecret, const CKeyMetadata &keyMeta); bool WriteMasterKey(unsigned int nID, const CMasterKey& kMasterKey); @@ -291,7 +291,7 @@ public: //! Delete records of the given types bool EraseRecords(const std::unordered_set& types); - bool WriteWalletFlags(const uint64_t flags); + bool WriteWalletFlags(uint64_t flags); //! Begin a new transaction bool TxnBegin(); //! Commit current transaction