mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make removeConflicts private

Browse Source
This commit is contained in:
Suhas Daftuar committed 2025-11-18 09:29:36 -05:00
1 parent 0402e6c780
commit b9cec7f0a1
1 file changed
+4 -1
Download Patch File Download Diff File Expand all files Collapse all files
src/txmempool.h
+4 -1
View File
@@ -320,6 +320,10 @@ private:
return TxMempoolInfo{it->GetSharedTx(), it->GetTime(), it->GetFee(), it->GetTxSize(), it->GetModifiedFee() - it->GetFee()}; return TxMempoolInfo{it->GetSharedTx(), it->GetTime(), it->GetFee(), it->GetTxSize(), it->GetModifiedFee() - it->GetFee()};
} }
// Helper to remove all transactions that conflict with a given
// transaction (used for transactions appearing in a block).
void removeConflicts(const CTransaction& tx) EXCLUSIVE_LOCKS_REQUIRED(cs);
public: public:
indirectmap<COutPoint, txiter> mapNextTx GUARDED_BY(cs); indirectmap<COutPoint, txiter> mapNextTx GUARDED_BY(cs);
std::map<Txid, CAmount> mapDeltas GUARDED_BY(cs); std::map<Txid, CAmount> mapDeltas GUARDED_BY(cs);
@@ -352,7 +356,6 @@ public:
* and updates an entry's LockPoints. * and updates an entry's LockPoints.
* */ * */
void removeForReorg(CChain& chain, std::function<bool(txiter)> filter_final_and_mature) EXCLUSIVE_LOCKS_REQUIRED(cs, cs_main); void removeForReorg(CChain& chain, std::function<bool(txiter)> filter_final_and_mature) EXCLUSIVE_LOCKS_REQUIRED(cs, cs_main);
void removeConflicts(const CTransaction& tx) EXCLUSIVE_LOCKS_REQUIRED(cs);
void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight) EXCLUSIVE_LOCKS_REQUIRED(cs); void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight) EXCLUSIVE_LOCKS_REQUIRED(cs);
bool CompareMiningScoreWithTopology(const Wtxid& hasha, const Wtxid& hashb) const; bool CompareMiningScoreWithTopology(const Wtxid& hasha, const Wtxid& hashb) const;