Merge #11870: wallet: Remove unnecessary mempool lock in ReacceptWalletTransactions

laanwj · laanwj · commit ef8ba7d73a48 · 2017-12-12T20:26:55.000+01:00
5b25293 wallet: Remove unnecessary mempool lock in ReacceptWalletTransactions (João Barbosa) Pull request description: Tree-SHA512: 13b922c6c9b5ca95a77742050f449366b80bdd7819c34e7ca09af8a4bd68085f4d0c6e0cde119c403f661499f97f2c465071a8047a7d794268e8d2dfe909e6d5
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1719,11 +1719,8 @@ void CWallet::ReacceptWalletTransactions()
     }
 
     // Try to add wallet transactions to memory pool
-    for (std::pair<const int64_t, CWalletTx*>& item : mapSorted)
-    {
+    for (std::pair<const int64_t, CWalletTx*>& item : mapSorted) {
         CWalletTx& wtx = *(item.second);
-
-        LOCK(mempool.cs);
         CValidationState state;
         wtx.AcceptToMemoryPool(maxTxFee, state);
     }

Original file line number	Diff line number	Diff line change
`@@ -1719,11 +1719,8 @@ void CWallet::ReacceptWalletTransactions()`
`1719`	`1719`	`}`
`1720`	`1720`
`1721`	`1721`	`// Try to add wallet transactions to memory pool`
`1722`		`- for (std::pair<const int64_t, CWalletTx*>& item : mapSorted)`
`1723`		`- {`
	`1722`	`+ for (std::pair<const int64_t, CWalletTx*>& item : mapSorted) {`
`1724`	`1723`	`CWalletTx& wtx = *(item.second);`
`1725`		`-`
`1726`		`- LOCK(mempool.cs);`
`1727`	`1724`	`CValidationState state;`
`1728`	`1725`	`wtx.AcceptToMemoryPool(maxTxFee, state);`
`1729`	`1726`	`}`