refactor: CTxMemPool::IsUnbroadcastTx() requires CTxMemPool::cs lock

hebasto · hebasto · commit 020f0519ec66 · 2020-09-01T12:36:27.000+03:00
No change in behavior, the lock is already held at call sites.
diff --git a/src/txmempool.h b/src/txmempool.h
@@ -757,9 +757,10 @@ class CTxMemPool
     }
 
     /** Returns whether a txid is in the unbroadcast set */
-    bool IsUnbroadcastTx(const uint256& txid) const {
-        LOCK(cs);
-        return (m_unbroadcast_txids.count(txid) != 0);
+    bool IsUnbroadcastTx(const uint256& txid) const EXCLUSIVE_LOCKS_REQUIRED(cs)
+    {
+        AssertLockHeld(cs);
+        return m_unbroadcast_txids.count(txid) != 0;
     }
 
 private:

Original file line number	Diff line number	Diff line change
`@@ -757,9 +757,10 @@ class CTxMemPool`
`757`	`757`	`}`
`758`	`758`
`759`	`759`	`/** Returns whether a txid is in the unbroadcast set */`
`760`		`- bool IsUnbroadcastTx(const uint256& txid) const {`
`761`		`- LOCK(cs);`
`762`		`- return (m_unbroadcast_txids.count(txid) != 0);`
	`760`	`+ bool IsUnbroadcastTx(const uint256& txid) const EXCLUSIVE_LOCKS_REQUIRED(cs)`
	`761`	`+ {`
	`762`	`+ AssertLockHeld(cs);`
	`763`	`+ return m_unbroadcast_txids.count(txid) != 0;`
`763`	`764`	`}`
`764`	`765`
`765`	`766`	`private:`