diff --git a/src/blockfileinfo.h b/src/blockfileinfo.h --- a/src/blockfileinfo.h +++ b/src/blockfileinfo.h @@ -12,19 +12,19 @@ class CBlockFileInfo { public: - //!< number of blocks stored in file + //! number of blocks stored in file unsigned int nBlocks; - //!< number of used bytes of block file + //! number of used bytes of block file unsigned int nSize; - //!< number of used bytes in the undo file + //! number of used bytes in the undo file unsigned int nUndoSize; - //!< lowest height of block in file + //! lowest height of block in file unsigned int nHeightFirst; - //!< highest height of block in file + //! highest height of block in file unsigned int nHeightLast; - //!< earliest time of block in file + //! earliest time of block in file uint64_t nTimeFirst; - //!< latest time of block in file + //! latest time of block in file uint64_t nTimeLast; ADD_SERIALIZE_METHODS; diff --git a/src/chainparams.cpp b/src/chainparams.cpp --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -473,9 +473,9 @@ uint256S("0x4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab212" "7b7afdeda33b")); - //!< Regtest mode doesn't have any fixed seeds. + //! Regtest mode doesn't have any fixed seeds. vFixedSeeds.clear(); - //!< Regtest mode doesn't have any DNS seeds. + //! Regtest mode doesn't have any DNS seeds. vSeeds.clear(); fDefaultConsistencyChecks = true; diff --git a/src/net_processing.h b/src/net_processing.h --- a/src/net_processing.h +++ b/src/net_processing.h @@ -109,7 +109,7 @@ void EvictExtraOutboundPeers(int64_t time_in_seconds); private: - //!< Next time to check for stale tip + //! Next time to check for stale tip int64_t m_stale_tip_check_time; /** Enable BIP61 (sending reject messages) */ diff --git a/src/net_processing.cpp b/src/net_processing.cpp --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -201,11 +201,11 @@ */ struct QueuedBlock { uint256 hash; - //!< Optional. + //! Optional. const CBlockIndex *pindex; - //!< Whether this block has validated headers at the time of request. + //! Whether this block has validated headers at the time of request. bool fValidatedHeaders; - //!< Optional, used for CMPCTBLOCK downloads + //! Optional, used for CMPCTBLOCK downloads std::unique_ptr partialBlock; }; std::map::iterator>> diff --git a/src/protocol.h b/src/protocol.h --- a/src/protocol.h +++ b/src/protocol.h @@ -419,9 +419,9 @@ MSG_TX = 1, MSG_BLOCK = 2, // The following can only occur in getdata. Invs always use TX or BLOCK. - //!< Defined in BIP37 + //! Defined in BIP37 MSG_FILTERED_BLOCK = 3, - //!< Defined in BIP152 + //! Defined in BIP152 MSG_CMPCT_BLOCK = 4, }; diff --git a/src/rpc/protocol.h b/src/rpc/protocol.h --- a/src/rpc/protocol.h +++ b/src/rpc/protocol.h @@ -43,29 +43,29 @@ RPC_PARSE_ERROR = -32700, //! General application defined errors - //!< std::exception thrown in command handling + //! std::exception thrown in command handling RPC_MISC_ERROR = -1, - //!< Unexpected type was passed as parameter + //! Unexpected type was passed as parameter RPC_TYPE_ERROR = -3, - //!< Invalid address or key + //! Invalid address or key RPC_INVALID_ADDRESS_OR_KEY = -5, - //!< Ran out of memory during operation + //! Ran out of memory during operation RPC_OUT_OF_MEMORY = -7, - //!< Invalid, missing or duplicate parameter + //! Invalid, missing or duplicate parameter RPC_INVALID_PARAMETER = -8, - //!< Database error + //! Database error RPC_DATABASE_ERROR = -20, - //!< Error parsing or validating structure in raw format + //! Error parsing or validating structure in raw format RPC_DESERIALIZATION_ERROR = -22, - //!< General error during transaction or block submission + //! General error during transaction or block submission RPC_VERIFY_ERROR = -25, - //!< Transaction or block was rejected by network rules + //! Transaction or block was rejected by network rules RPC_VERIFY_REJECTED = -26, - //!< Transaction already in chain + //! Transaction already in chain RPC_VERIFY_ALREADY_IN_CHAIN = -27, - //!< Client still warming up + //! Client still warming up RPC_IN_WARMUP = -28, - //!< RPC method is deprecated + //! RPC method is deprecated RPC_METHOD_DEPRECATED = -32, //! Aliases for backward compatibility @@ -74,51 +74,51 @@ RPC_TRANSACTION_ALREADY_IN_CHAIN = RPC_VERIFY_ALREADY_IN_CHAIN, //! P2P client errors - //!< Bitcoin is not connected + //! Bitcoin is not connected RPC_CLIENT_NOT_CONNECTED = -9, - //!< Still downloading initial blocks + //! Still downloading initial blocks RPC_CLIENT_IN_INITIAL_DOWNLOAD = -10, - //!< Node is already added + //! Node is already added RPC_CLIENT_NODE_ALREADY_ADDED = -23, - //!< Node has not been added before + //! Node has not been added before RPC_CLIENT_NODE_NOT_ADDED = -24, - //!< Node to disconnect not found in connected nodes + //! Node to disconnect not found in connected nodes RPC_CLIENT_NODE_NOT_CONNECTED = -29, - //!< Invalid IP/Subnet + //! Invalid IP/Subnet RPC_CLIENT_INVALID_IP_OR_SUBNET = -30, - //!< No valid connection manager instance found + //! No valid connection manager instance found RPC_CLIENT_P2P_DISABLED = -31, //! Wallet errors - //!< Unspecified problem with wallet (key not found etc.) + //! Unspecified problem with wallet (key not found etc.) RPC_WALLET_ERROR = -4, - //!< Not enough funds in wallet or account + //! Not enough funds in wallet or account RPC_WALLET_INSUFFICIENT_FUNDS = -6, - //!< Invalid label name + //! Invalid label name RPC_WALLET_INVALID_LABEL_NAME = -11, - //!< Keypool ran out, call keypoolrefill first + //! Keypool ran out, call keypoolrefill first RPC_WALLET_KEYPOOL_RAN_OUT = -12, - //!< Enter the wallet passphrase with walletpassphrase first + //! Enter the wallet passphrase with walletpassphrase first RPC_WALLET_UNLOCK_NEEDED = -13, - //!< The wallet passphrase entered was incorrect + //! The wallet passphrase entered was incorrect RPC_WALLET_PASSPHRASE_INCORRECT = -14, - //!< Command given in wrong wallet encryption state (encrypting an encrypted + //! Command given in wrong wallet encryption state (encrypting an encrypted //! wallet etc.) RPC_WALLET_WRONG_ENC_STATE = -15, - //!< Failed to encrypt the wallet + //! Failed to encrypt the wallet RPC_WALLET_ENCRYPTION_FAILED = -16, - //!< Wallet is already unlocked + //! Wallet is already unlocked RPC_WALLET_ALREADY_UNLOCKED = -17, - //!< Invalid wallet specified + //! Invalid wallet specified RPC_WALLET_NOT_FOUND = -18, - //!< No wallet specified (error when there are multiple wallets loaded) + //! No wallet specified (error when there are multiple wallets loaded) RPC_WALLET_NOT_SPECIFIED = -19, - //!< Backwards compatible aliases + //! Backwards compatible aliases RPC_WALLET_INVALID_ACCOUNT_NAME = RPC_WALLET_INVALID_LABEL_NAME, //! Unused reserved codes, kept around for backwards compatibility. Do not //! reuse. - //!< Server is in safe mode, and command is not allowed in safe mode + //! Server is in safe mode, and command is not allowed in safe mode RPC_FORBIDDEN_BY_SAFE_MODE = -2, }; diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -1344,13 +1344,13 @@ */ template class CTransactionSignatureSerializer { private: - //!< reference to the spending transaction (the one being serialized) + //! reference to the spending transaction (the one being serialized) const T &txTo; - //!< output script being consumed + //! output script being consumed const CScript &scriptCode; - //!< input index of txTo being signed + //! input index of txTo being signed const unsigned int nIn; - //!< container for hashtype flags + //! container for hashtype flags const SigHashType sigHashType; public: diff --git a/src/txmempool.h b/src/txmempool.h --- a/src/txmempool.h +++ b/src/txmempool.h @@ -67,36 +67,36 @@ class CTxMemPoolEntry { private: const CTransactionRef tx; - //!< Cached to avoid expensive parent-transaction lookups + //! Cached to avoid expensive parent-transaction lookups const Amount nFee; - //!< ... and avoid recomputing tx size + //! ... and avoid recomputing tx size const size_t nTxSize; - //!< ... and total memory usage + //! ... and total memory usage const size_t nUsageSize; - //!< Local time when entering the mempool + //! Local time when entering the mempool const int64_t nTime; - //!< Chain height when entering the mempool + //! Chain height when entering the mempool const unsigned int entryHeight; - //!< keep track of transactions that spend a coinbase + //! keep track of transactions that spend a coinbase const bool spendsCoinbase; - //!< Total sigop plus P2SH sigops count + //! Total sigop plus P2SH sigops count const int64_t sigOpCount; - //!< Used for determining the priority of the transaction for mining in a + //! Used for determining the priority of the transaction for mining in a //! block Amount feeDelta; - //!< Track the height and time at which tx was final + //! Track the height and time at which tx was final LockPoints lockPoints; // Information about descendants of this transaction that are in the // mempool; if we remove this transaction we must remove all of these // descendants as well. - //!< number of descendant transactions + //! number of descendant transactions uint64_t nCountWithDescendants; - //!< ... and size + //! ... and size uint64_t nSizeWithDescendants; - //!< ... and total fees (all including us) + //! ... and total fees (all including us) Amount nModFeesWithDescendants; - //!< ... and sigop count + //! ... and sigop count int64_t nSigOpCountWithDescendants; // Analogous statistics for ancestor transactions @@ -153,7 +153,7 @@ return nSigOpCountWithAncestors; } - //!< Index in mempool's vTxHashes + //! Index in mempool's vTxHashes mutable size_t vTxHashesIdx; }; @@ -363,19 +363,19 @@ * notification signal. */ enum class MemPoolRemovalReason { - //!< Manually removed or unknown reason + //! Manually removed or unknown reason UNKNOWN = 0, - //!< Expired from mempool + //! Expired from mempool EXPIRY, - //!< Removed in size limiting + //! Removed in size limiting SIZELIMIT, - //!< Removed for reorganization + //! Removed for reorganization REORG, - //!< Removed for block + //! Removed for block BLOCK, - //!< Removed for conflict with in-block transaction + //! Removed for conflict with in-block transaction CONFLICT, - //!< Removed for replacement + //! Removed for replacement REPLACED }; @@ -467,20 +467,20 @@ */ class CTxMemPool { private: - //!< Value n means that n times in 2^32 we check. + //! Value n means that n times in 2^32 we check. uint32_t nCheckFrequency GUARDED_BY(cs); - //!< Used by getblocktemplate to trigger CreateNewBlock() invocation + //! Used by getblocktemplate to trigger CreateNewBlock() invocation unsigned int nTransactionsUpdated; - //!< sum of all mempool tx's sizes. + //! sum of all mempool tx's sizes. uint64_t totalTxSize; - //!< sum of dynamic memory usage of all the map elements (NOT the maps + //! sum of dynamic memory usage of all the map elements (NOT the maps //! themselves) uint64_t cachedInnerUsage; mutable int64_t lastRollingFeeUpdate; mutable bool blockSinceLastRollingFeeBump; - //!< minimum fee to get into the pool, decreases exponentially + //! minimum fee to get into the pool, decreases exponentially mutable double rollingMinimumFeeRate; void trackPackageRemoved(const CFeeRate &rate) EXCLUSIVE_LOCKS_REQUIRED(cs); @@ -553,7 +553,7 @@ indexed_transaction_set mapTx GUARDED_BY(cs); typedef indexed_transaction_set::nth_index<0>::type::iterator txiter; - //!< All tx hashes/entries in mapTx, in random order + //! All tx hashes/entries in mapTx, in random order std::vector> vTxHashes; struct CompareIteratorById { diff --git a/src/util/strencodings.h b/src/util/strencodings.h --- a/src/util/strencodings.h +++ b/src/util/strencodings.h @@ -23,11 +23,11 @@ /** Used by SanitizeString() */ enum SafeChars { - //!< The full set of allowed chars + //! The full set of allowed chars SAFE_CHARS_DEFAULT, - //!< BIP-0014 subset + //! BIP-0014 subset SAFE_CHARS_UA_COMMENT, - //!< Chars allowed in filenames + //! Chars allowed in filenames SAFE_CHARS_FILENAME, }; diff --git a/src/util/time.cpp b/src/util/time.cpp --- a/src/util/time.cpp +++ b/src/util/time.cpp @@ -17,7 +17,7 @@ #include #include -//!< For unit testing +//! For unit testing static std::atomic nMockTime(0); int64_t GetTime() { diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp --- a/src/wallet/db.cpp +++ b/src/wallet/db.cpp @@ -59,7 +59,7 @@ CCriticalSection cs_db; -//!< Map from directory name to db environment. +//! Map from directory name to db environment. std::map> g_dbenvs GUARDED_BY(cs_db); } // namespace diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -373,7 +373,7 @@ mapValue_t mapValue; std::vector> vOrderForm; unsigned int fTimeReceivedIsTxTime; - //!< time received by this node + //! time received by this node unsigned int nTimeReceived; /** * Stable timestamp that never changes, and reflects the order a transaction @@ -392,7 +392,7 @@ */ char fFromMe; std::string strFromAccount; - //!< position in ordered transaction list + //! position in ordered transaction list int64_t nOrderPos; std::multimap>::const_iterator @@ -466,7 +466,7 @@ } s << static_cast(*this); - //!< Used to be vtxPrev + //! Used to be vtxPrev std::vector vUnused; s << vUnused << mapValueCopy << vOrderForm << fTimeReceivedIsTxTime << nTimeReceived << fFromMe << fSpent; @@ -477,7 +477,7 @@ char fSpent; s >> static_cast(*this); - //!< Used to be vtxPrev + //! Used to be vtxPrev std::vector vUnused; s >> vUnused >> mapValue >> vOrderForm >> fTimeReceivedIsTxTime >> nTimeReceived >> fFromMe >> fSpent; @@ -670,7 +670,7 @@ std::string strOtherAccount; std::string strComment; mapValue_t mapValue; - //!< position in ordered transaction list + //! position in ordered transaction list int64_t nOrderPos; uint64_t nEntryNo; diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h --- a/src/wallet/walletdb.h +++ b/src/wallet/walletdb.h @@ -63,7 +63,7 @@ public: uint32_t nExternalChainCounter; uint32_t nInternalChainCounter; - //!< seed hash160 + //! seed hash160 CKeyID seed_id; static const int VERSION_HD_BASE = 1; diff --git a/src/zmq/zmqpublishnotifier.h b/src/zmq/zmqpublishnotifier.h --- a/src/zmq/zmqpublishnotifier.h +++ b/src/zmq/zmqpublishnotifier.h @@ -11,7 +11,7 @@ class CZMQAbstractPublishNotifier : public CZMQAbstractNotifier { private: - //!< upcounting per message sequence number + //! upcounting per message sequence number uint32_t nSequence; public: