diff options
| author | Pieter Wuille <[email protected]> | 2013-10-19 17:21:49 +0200 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2013-10-26 14:49:47 +0200 |
| commit | fe5234645036178a540fdd4166b26493b0b40529 (patch) | |
| tree | 37e7d06501542b28ebe30c4d44ee49a2ae8b7e11 /src/main.cpp | |
| parent | Merge pull request #3144 from Diapolo/message_sendcoinsdialog (diff) | |
| download | discoin-fe5234645036178a540fdd4166b26493b0b40529.tar.xz discoin-fe5234645036178a540fdd4166b26493b0b40529.zip | |
Do not treat fFromMe transaction differently when broadcasting
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/main.cpp b/src/main.cpp index 01a1babc7..f9c49a6f3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -97,16 +97,6 @@ void UnregisterAllWallets() setpwalletRegistered.clear(); } -// get the wallet transaction with the given hash (if it exists) -bool static GetTransaction(const uint256& hashTx, CWalletTx& wtx) -{ - LOCK(cs_setpwalletRegistered); - BOOST_FOREACH(CWallet* pwallet, setpwalletRegistered) - if (pwallet->GetTransaction(hashTx,wtx)) - return true; - return false; -} - // erases transaction with the given hash from all wallets void static EraseFromWallets(uint256 hash) { @@ -4241,15 +4231,6 @@ bool SendMessages(CNode* pto, bool fSendTrickle) hashRand = Hash(BEGIN(hashRand), END(hashRand)); bool fTrickleWait = ((hashRand & 3) != 0); - // always trickle our own transactions - if (!fTrickleWait) - { - CWalletTx wtx; - if (GetTransaction(inv.hash, wtx)) - if (wtx.fFromMe) - fTrickleWait = true; - } - if (fTrickleWait) { vInvWait.push_back(inv); |