From d16006960443c2efe37c896e46edae9dca86c57d Mon Sep 17 00:00:00 2001 From: gzhao408 Date: Fri, 1 May 2020 17:22:59 -0700 Subject: [wallet] remove nLastResend logic remove nLastResend because it's unnecessary now that rebroadcasts always happen at least 12 hours later --- src/wallet/wallet.cpp | 4 ---- src/wallet/wallet.h | 1 - 2 files changed, 5 deletions(-) (limited to 'src') diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 2b45c6a536..e1e8263ee1 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1982,10 +1982,6 @@ void CWallet::ResendWalletTransactions() nNextResend = GetTime() + (12 * 60 * 60) + GetRand(24 * 60 * 60); if (fFirst) return; - // Only do it if there's been a new block since last time - if (m_best_block_time < nLastResend) return; - nLastResend = GetTime(); - int submitted_tx_count = 0; { // cs_wallet scope diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index a29fa22207..9d312e8ee5 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -641,7 +641,6 @@ private: int nWalletMaxVersion GUARDED_BY(cs_wallet) = FEATURE_BASE; int64_t nNextResend = 0; - int64_t nLastResend = 0; bool fBroadcastTransactions = false; // Local time that the tip block was received. Used to schedule wallet rebroadcasts. std::atomic m_best_block_time {0}; -- cgit v1.2.3