diff options
| author | Antoine Riard <ariard@student.42.fr> | 2019-04-11 16:01:58 +0000 |
|---|---|---|
| committer | Antoine Riard <ariard@student.42.fr> | 2019-08-01 13:43:29 -0400 |
| commit | 8753f5652b4710e66b50ce87788bf6f33619b75a (patch) | |
| tree | b77ff172b501051256b3e29cdc30155b9bcf005c /src/wallet/wallet.h | |
| parent | 611291c198eb2be9bf1aea1bf9b2187b18bdb3aa (diff) | |
| download | bitcoin-8753f5652b4710e66b50ce87788bf6f33619b75a.tar.xz | |
Remove duplicate checks in SubmitMemoryPoolAndRelay
IsCoinBase check is already performed early by
AcceptToMemoryPoolWorker
GetDepthInMainChain check is already perfomed by
BroadcastTransaction
To avoid deadlock we MUST keep lock order in
ResendWalletTransactions and CommitTransaction,
even if we lock cs_main again further.
in BroadcastTransaction. Lock order will need
to be clean at once in a future refactoring
Diffstat (limited to 'src/wallet/wallet.h')
| -rw-r--r-- | src/wallet/wallet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 167096d472..d06d517937 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -580,7 +580,7 @@ public: int64_t GetTxTime() const; // Pass this transaction to node for mempool insertion and relay to peers if flag set to true - bool SubmitMemoryPoolAndRelay(std::string& err_string, bool relay, interfaces::Chain::Lock& locked_chain); + bool SubmitMemoryPoolAndRelay(std::string& err_string, bool relay); // TODO: Remove "NO_THREAD_SAFETY_ANALYSIS" and replace it with the correct // annotation "EXCLUSIVE_LOCKS_REQUIRED(pwallet->cs_wallet)". The annotation |