diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-12-12 19:58:37 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-12-12 20:26:55 +0100 |
| commit | ef8ba7d73a480197b756fab00126914e49de4e7b (patch) | |
| tree | ad5363693a460d0055f5a33545c3e8501329fdc4 /src | |
| parent | 22149540f9e74ddff84973d9818ec9a34a533764 (diff) | |
| parent | 5b252934362c2971e521df56c26ced56f07deb72 (diff) | |
| download | bitcoin-ef8ba7d73a480197b756fab00126914e49de4e7b.tar.xz | |
Merge #11870: wallet: Remove unnecessary mempool lock in ReacceptWalletTransactions
5b25293 wallet: Remove unnecessary mempool lock in ReacceptWalletTransactions (João Barbosa)
Pull request description:
Tree-SHA512: 13b922c6c9b5ca95a77742050f449366b80bdd7819c34e7ca09af8a4bd68085f4d0c6e0cde119c403f661499f97f2c465071a8047a7d794268e8d2dfe909e6d5
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/wallet.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 873a8d855e..b9b4d8ddff 100644 --- 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); } |