mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-03 09:56:38 -05:00
Don't declare de facto const member functions as non-const
This commit is contained in:
parent
64156ad4d1
commit
1c65c075ee
13 changed files with 20 additions and 20 deletions
|
@ -174,7 +174,7 @@ bool GetLogCategory(BCLog::LogFlags& flag, const std::string& str)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<LogCategory> BCLog::Logger::LogCategoriesList()
|
std::vector<LogCategory> BCLog::Logger::LogCategoriesList() const
|
||||||
{
|
{
|
||||||
std::vector<LogCategory> ret;
|
std::vector<LogCategory> ret;
|
||||||
for (const CLogCategoryDesc& category_desc : LogCategories) {
|
for (const CLogCategoryDesc& category_desc : LogCategories) {
|
||||||
|
|
|
@ -135,9 +135,9 @@ namespace BCLog {
|
||||||
|
|
||||||
bool WillLogCategory(LogFlags category) const;
|
bool WillLogCategory(LogFlags category) const;
|
||||||
/** Returns a vector of the log categories */
|
/** Returns a vector of the log categories */
|
||||||
std::vector<LogCategory> LogCategoriesList();
|
std::vector<LogCategory> LogCategoriesList() const;
|
||||||
/** Returns a string with the log categories */
|
/** Returns a string with the log categories */
|
||||||
std::string LogCategoriesString()
|
std::string LogCategoriesString() const
|
||||||
{
|
{
|
||||||
return Join(LogCategoriesList(), ", ", [&](const LogCategory& i) { return i.category; });
|
return Join(LogCategoriesList(), ", ", [&](const LogCategory& i) { return i.category; });
|
||||||
};
|
};
|
||||||
|
|
|
@ -213,7 +213,7 @@ bool BlockAssembler::TestPackage(uint64_t packageSize, int64_t packageSigOpsCost
|
||||||
// - transaction finality (locktime)
|
// - transaction finality (locktime)
|
||||||
// - premature witness (in case segwit transactions are added to mempool before
|
// - premature witness (in case segwit transactions are added to mempool before
|
||||||
// segwit activation)
|
// segwit activation)
|
||||||
bool BlockAssembler::TestPackageTransactions(const CTxMemPool::setEntries& package)
|
bool BlockAssembler::TestPackageTransactions(const CTxMemPool::setEntries& package) const
|
||||||
{
|
{
|
||||||
for (CTxMemPool::txiter it : package) {
|
for (CTxMemPool::txiter it : package) {
|
||||||
if (!IsFinalTx(it->GetTx(), nHeight, nLockTimeCutoff))
|
if (!IsFinalTx(it->GetTx(), nHeight, nLockTimeCutoff))
|
||||||
|
|
|
@ -185,7 +185,7 @@ private:
|
||||||
* locktime, premature-witness, serialized size (if necessary)
|
* locktime, premature-witness, serialized size (if necessary)
|
||||||
* These checks should always succeed, and they're here
|
* These checks should always succeed, and they're here
|
||||||
* only as an extra check in case of suboptimal node configuration */
|
* only as an extra check in case of suboptimal node configuration */
|
||||||
bool TestPackageTransactions(const CTxMemPool::setEntries& package);
|
bool TestPackageTransactions(const CTxMemPool::setEntries& package) const;
|
||||||
/** Return true if given transaction from mapTx has already been evaluated,
|
/** Return true if given transaction from mapTx has already been evaluated,
|
||||||
* or if the transaction's cached data in mapTx is incorrect. */
|
* or if the transaction's cached data in mapTx is incorrect. */
|
||||||
bool SkipMapTxEntry(CTxMemPool::txiter it, indexed_modified_transaction_set& mapModifiedTx, CTxMemPool::setEntries& failedTx) EXCLUSIVE_LOCKS_REQUIRED(m_mempool.cs);
|
bool SkipMapTxEntry(CTxMemPool::txiter it, indexed_modified_transaction_set& mapModifiedTx, CTxMemPool::setEntries& failedTx) EXCLUSIVE_LOCKS_REQUIRED(m_mempool.cs);
|
||||||
|
|
|
@ -1216,7 +1216,7 @@ void CConnman::NotifyNumConnectionsChanged()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CConnman::InactivityCheck(CNode *pnode)
|
void CConnman::InactivityCheck(CNode *pnode) const
|
||||||
{
|
{
|
||||||
int64_t nTime = GetSystemTimeInSeconds();
|
int64_t nTime = GetSystemTimeInSeconds();
|
||||||
if (nTime - pnode->nTimeConnected > m_peer_connect_timeout)
|
if (nTime - pnode->nTimeConnected > m_peer_connect_timeout)
|
||||||
|
|
|
@ -423,7 +423,7 @@ private:
|
||||||
void AcceptConnection(const ListenSocket& hListenSocket);
|
void AcceptConnection(const ListenSocket& hListenSocket);
|
||||||
void DisconnectNodes();
|
void DisconnectNodes();
|
||||||
void NotifyNumConnectionsChanged();
|
void NotifyNumConnectionsChanged();
|
||||||
void InactivityCheck(CNode *pnode);
|
void InactivityCheck(CNode *pnode) const;
|
||||||
bool GenerateSelectSet(std::set<SOCKET> &recv_set, std::set<SOCKET> &send_set, std::set<SOCKET> &error_set);
|
bool GenerateSelectSet(std::set<SOCKET> &recv_set, std::set<SOCKET> &send_set, std::set<SOCKET> &error_set);
|
||||||
void SocketEvents(std::set<SOCKET> &recv_set, std::set<SOCKET> &send_set, std::set<SOCKET> &error_set);
|
void SocketEvents(std::set<SOCKET> &recv_set, std::set<SOCKET> &send_set, std::set<SOCKET> &error_set);
|
||||||
void SocketHandler();
|
void SocketHandler();
|
||||||
|
|
|
@ -305,8 +305,8 @@ private:
|
||||||
uint32_t m_first_false_pos = NO_FALSE;
|
uint32_t m_first_false_pos = NO_FALSE;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
bool empty() { return m_stack_size == 0; }
|
bool empty() const { return m_stack_size == 0; }
|
||||||
bool all_true() { return m_first_false_pos == NO_FALSE; }
|
bool all_true() const { return m_first_false_pos == NO_FALSE; }
|
||||||
void push_back(bool f)
|
void push_back(bool f)
|
||||||
{
|
{
|
||||||
if (m_first_false_pos == NO_FALSE && !f) {
|
if (m_first_false_pos == NO_FALSE && !f) {
|
||||||
|
|
|
@ -26,7 +26,7 @@ static const unsigned int QUEUE_BATCH_SIZE = 128;
|
||||||
static const int SCRIPT_CHECK_THREADS = 3;
|
static const int SCRIPT_CHECK_THREADS = 3;
|
||||||
|
|
||||||
struct FakeCheck {
|
struct FakeCheck {
|
||||||
bool operator()()
|
bool operator()() const
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -47,7 +47,7 @@ struct FailingCheck {
|
||||||
bool fails;
|
bool fails;
|
||||||
FailingCheck(bool _fails) : fails(_fails){};
|
FailingCheck(bool _fails) : fails(_fails){};
|
||||||
FailingCheck() : fails(true){};
|
FailingCheck() : fails(true){};
|
||||||
bool operator()()
|
bool operator()() const
|
||||||
{
|
{
|
||||||
return !fails;
|
return !fails;
|
||||||
}
|
}
|
||||||
|
@ -76,7 +76,7 @@ struct UniqueCheck {
|
||||||
struct MemoryCheck {
|
struct MemoryCheck {
|
||||||
static std::atomic<size_t> fake_allocated_memory;
|
static std::atomic<size_t> fake_allocated_memory;
|
||||||
bool b {false};
|
bool b {false};
|
||||||
bool operator()()
|
bool operator()() const
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -107,7 +107,7 @@ struct FrozenCleanupCheck {
|
||||||
// Freezing can't be the default initialized behavior given how the queue
|
// Freezing can't be the default initialized behavior given how the queue
|
||||||
// swaps in default initialized Checks.
|
// swaps in default initialized Checks.
|
||||||
bool should_freeze {false};
|
bool should_freeze {false};
|
||||||
bool operator()()
|
bool operator()() const
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -231,12 +231,12 @@ TestChain100Setup::~TestChain100Setup()
|
||||||
gArgs.ForceSetArg("-segwitheight", "0");
|
gArgs.ForceSetArg("-segwitheight", "0");
|
||||||
}
|
}
|
||||||
|
|
||||||
CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(const CMutableTransaction& tx)
|
CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(const CMutableTransaction& tx) const
|
||||||
{
|
{
|
||||||
return FromTx(MakeTransactionRef(tx));
|
return FromTx(MakeTransactionRef(tx));
|
||||||
}
|
}
|
||||||
|
|
||||||
CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(const CTransactionRef& tx)
|
CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(const CTransactionRef& tx) const
|
||||||
{
|
{
|
||||||
return CTxMemPoolEntry(tx, nFee, nTime, nHeight,
|
return CTxMemPoolEntry(tx, nFee, nTime, nHeight,
|
||||||
spendsCoinbase, sigOpCost, lp);
|
spendsCoinbase, sigOpCost, lp);
|
||||||
|
|
|
@ -138,8 +138,8 @@ struct TestMemPoolEntryHelper
|
||||||
nFee(0), nTime(0), nHeight(1),
|
nFee(0), nTime(0), nHeight(1),
|
||||||
spendsCoinbase(false), sigOpCost(4) { }
|
spendsCoinbase(false), sigOpCost(4) { }
|
||||||
|
|
||||||
CTxMemPoolEntry FromTx(const CMutableTransaction& tx);
|
CTxMemPoolEntry FromTx(const CMutableTransaction& tx) const;
|
||||||
CTxMemPoolEntry FromTx(const CTransactionRef& tx);
|
CTxMemPoolEntry FromTx(const CTransactionRef& tx) const;
|
||||||
|
|
||||||
// Change the default value
|
// Change the default value
|
||||||
TestMemPoolEntryHelper &Fee(CAmount _fee) { nFee = _fee; return *this; }
|
TestMemPoolEntryHelper &Fee(CAmount _fee) { nFee = _fee; return *this; }
|
||||||
|
|
|
@ -564,7 +564,7 @@ public:
|
||||||
|
|
||||||
//! @returns whether or not the CoinsViews object has been fully initialized and we can
|
//! @returns whether or not the CoinsViews object has been fully initialized and we can
|
||||||
//! safely flush this object to disk.
|
//! safely flush this object to disk.
|
||||||
bool CanFlushToDisk() EXCLUSIVE_LOCKS_REQUIRED(cs_main) {
|
bool CanFlushToDisk() const EXCLUSIVE_LOCKS_REQUIRED(cs_main) {
|
||||||
return m_coins_views && m_coins_views->m_cacheview;
|
return m_coins_views && m_coins_views->m_cacheview;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2706,7 +2706,7 @@ static uint32_t GetLocktimeForNewTransaction(interfaces::Chain& chain, const uin
|
||||||
return locktime;
|
return locktime;
|
||||||
}
|
}
|
||||||
|
|
||||||
OutputType CWallet::TransactionChangeType(const Optional<OutputType>& change_type, const std::vector<CRecipient>& vecSend)
|
OutputType CWallet::TransactionChangeType(const Optional<OutputType>& change_type, const std::vector<CRecipient>& vecSend) const
|
||||||
{
|
{
|
||||||
// If -changetype is specified, always use that change type.
|
// If -changetype is specified, always use that change type.
|
||||||
if (change_type) {
|
if (change_type) {
|
||||||
|
|
|
@ -930,7 +930,7 @@ public:
|
||||||
Balance GetBalance(int min_depth = 0, bool avoid_reuse = true) const;
|
Balance GetBalance(int min_depth = 0, bool avoid_reuse = true) const;
|
||||||
CAmount GetAvailableBalance(const CCoinControl* coinControl = nullptr) const;
|
CAmount GetAvailableBalance(const CCoinControl* coinControl = nullptr) const;
|
||||||
|
|
||||||
OutputType TransactionChangeType(const Optional<OutputType>& change_type, const std::vector<CRecipient>& vecSend);
|
OutputType TransactionChangeType(const Optional<OutputType>& change_type, const std::vector<CRecipient>& vecSend) const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Insert additional inputs into the transaction by
|
* Insert additional inputs into the transaction by
|
||||||
|
|
Loading…
Add table
Reference in a new issue