aboutsummaryrefslogtreecommitdiff
path: root/src/net_processing.cpp
diff options
context:
space:
mode:
authorMeshCollider <[email protected]>2019-04-10 09:52:48 +1200
committerMeshCollider <[email protected]>2019-04-10 09:53:08 +1200
commit93de9abe6d6847bce6db8da15f15b50b01972e70 (patch)
treeeb3cc744dfdab835e09137f466ca83a5b3daec9d /src/net_processing.cpp
parentMerge #15693: travis: Switch to ubuntu keyserver to avoid timeouts (diff)
parent[wallet] Remove unnecessary Chain::Lock parameter from ResendWalletTransactions (diff)
downloaddiscoin-93de9abe6d6847bce6db8da15f15b50b01972e70.tar.xz
discoin-93de9abe6d6847bce6db8da15f15b50b01972e70.zip
Merge #15632: Remove ResendWalletTransactions from the Validation Interface
833d98ae0 [wallet] Remove unnecessary Chain::Lock parameter from ResendWalletTransactions (John Newbery) 52b760fc6 [wallet] Schedule tx rebroadcasts in wallet (John Newbery) f463cd107 [wallet] Keep track of the best block time in the wallet (John Newbery) Pull request description: Remove the `Broadcast()`/`ResendWalletTransactions()` notification from the Validation interface. Closes #15619. See that issue for discussion. ACKs for commit 833d98: ryanofsky: utACK 833d98ae073daf0f25f786f043f2ffa85155c8ff. No changes, just rebase. Tree-SHA512: 7689f2083608ebad8c95ab6692f7842754e1ebe5508bc926a89cad7105cce41007648f37341ba5feb92b30a7aa87acd3abf264a4f1874e35a7161553f6ff3595
Diffstat (limited to 'src/net_processing.cpp')
-rw-r--r--src/net_processing.cpp12
1 files changed, 0 insertions, 12 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 0f13d6e26..044fcc90c 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -175,8 +175,6 @@ namespace {
/** Expiration-time ordered list of (expire time, relay map entry) pairs. */
std::deque<std::pair<int64_t, MapRelay::iterator>> vRelayExpiration GUARDED_BY(cs_main);
- std::atomic<int64_t> nTimeBestReceived(0); // Used only to inform the wallet of when we last received a block
-
struct IteratorComparator
{
template<typename I>
@@ -1121,8 +1119,6 @@ void PeerLogicValidation::UpdatedBlockTip(const CBlockIndex *pindexNew, const CB
});
connman->WakeMessageHandler();
}
-
- nTimeBestReceived = GetTime();
}
/**
@@ -3550,14 +3546,6 @@ bool PeerLogicValidation::SendMessages(CNode* pto)
}
}
- // Resend wallet transactions that haven't gotten in a block yet
- // Except during reindex, importing and IBD, when old wallet
- // transactions become unconfirmed and spams other nodes.
- if (!fReindex && !fImporting && !IsInitialBlockDownload())
- {
- GetMainSignals().Broadcast(nTimeBestReceived, connman);
- }
-
//
// Try sending block announcements via headers
//