diff --git a/src/miner.h b/src/miner.h --- a/src/miner.h +++ b/src/miner.h @@ -98,7 +98,7 @@ if (a->GetCountWithAncestors() != b->GetCountWithAncestors()) { return a->GetCountWithAncestors() < b->GetCountWithAncestors(); } - return CTxMemPool::CompareIteratorByHash()(a, b); + return CTxMemPool::CompareIteratorById()(a, b); } }; diff --git a/src/txmempool.h b/src/txmempool.h --- a/src/txmempool.h +++ b/src/txmempool.h @@ -215,7 +215,7 @@ const LockPoints &lp; }; -// extracts a transaction hash from CTxMemPoolEntry or CTransactionRef +// extracts a transaction id from CTxMemPoolEntry or CTransactionRef struct mempoolentry_txid { typedef TxId result_type; result_type operator()(const CTxMemPoolEntry &entry) const { @@ -557,12 +557,12 @@ //!< All tx hashes/entries in mapTx, in random order std::vector> vTxHashes; - struct CompareIteratorByHash { + struct CompareIteratorById { bool operator()(const txiter &a, const txiter &b) const { return a->GetTx().GetId() < b->GetTx().GetId(); } }; - typedef std::set setEntries; + typedef std::set setEntries; const setEntries &GetMemPoolParents(txiter entry) const EXCLUSIVE_LOCKS_REQUIRED(cs); @@ -572,14 +572,14 @@ EXCLUSIVE_LOCKS_REQUIRED(cs); private: - typedef std::map cacheMap; + typedef std::map cacheMap; struct TxLinks { setEntries parents; setEntries children; }; - typedef std::map txlinksMap; + typedef std::map txlinksMap; txlinksMap mapLinks; void UpdateParent(txiter entry, txiter parent, bool add);