diff options
| author | fanquake <fanquake@gmail.com> | 2022-10-24 10:00:57 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-10-24 10:11:13 +0800 |
| commit | 50cc8ef5a72b927cd30f12e6583cad85c43d3c01 (patch) | |
| tree | 9de03dbf789cac1633007cbbd52d969c4b0e05c2 /src/wallet/wallet.h | |
| parent | 6d4048468430d9d1fe5e7c5fcda13708879d1083 (diff) | |
| parent | fa51cc965110e14661c848364a29c493287673be (diff) | |
| download | bitcoin-50cc8ef5a72b927cd30f12e6583cad85c43d3c01.tar.xz | |
Merge bitcoin/bitcoin#26302: refactor: Use type-safe time point for CWallet::m_next_resend
fa51cc965110e14661c848364a29c493287673be refactor: Use type-safe time point for CWallet::m_next_resend (MacroFake)
Pull request description:
`GetTime` is not type-safe, thus deprecated, see https://github.com/bitcoin/bitcoin/blob/75cbbfa279685f70d9f6fa71432df00862ffa865/src/util/time.h#L62-L70
ACKs for top commit:
shaavan:
Code Review ACK fa51cc965110e14661c848364a29c493287673be
aureleoules:
ACK fa51cc965110e14661c848364a29c493287673be
Tree-SHA512: 030de10070518580763ea75079442e2f934c54d3083be3ebe35e7f1bc6db2096745bb46d95aa1e6efe29ced30a048acfe5cd999178e6787b7647dfbec5ecb444
Diffstat (limited to 'src/wallet/wallet.h')
| -rw-r--r-- | src/wallet/wallet.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 352f43ef99..137320acda 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -20,6 +20,7 @@ #include <util/strencodings.h> #include <util/string.h> #include <util/system.h> +#include <util/time.h> #include <util/ui_change_type.h> #include <validationinterface.h> #include <wallet/crypter.h> @@ -250,7 +251,7 @@ private: int nWalletVersion GUARDED_BY(cs_wallet){FEATURE_BASE}; /** The next scheduled rebroadcast of wallet transactions. */ - int64_t m_next_resend{GetDefaultNextResend()}; + NodeClock::time_point m_next_resend{GetDefaultNextResend()}; /** Whether this wallet will submit newly created transactions to the node's mempool and * prompt rebroadcasts (see ResendWalletTransactions()). */ bool fBroadcastTransactions = false; @@ -348,7 +349,7 @@ private: */ static bool AttachChain(const std::shared_ptr<CWallet>& wallet, interfaces::Chain& chain, const bool rescan_required, bilingual_str& error, std::vector<bilingual_str>& warnings); - static int64_t GetDefaultNextResend(); + static NodeClock::time_point GetDefaultNextResend(); public: /** |