diff options
| author | fanquake <fanquake@gmail.com> | 2022-08-22 09:56:23 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-08-22 10:00:46 +0100 |
| commit | 0f35f4ddf405196a61bfc0616b82e826f1698862 (patch) | |
| tree | f989ddac7885e36409438a096cf95ce787b44bd3 /src/validation.h | |
| parent | 027b6729bce7f59a0744e17b210e347a098631ad (diff) | |
| parent | eeee5ada23f2a71d245671556b6ecfdaabfeddf4 (diff) | |
| download | bitcoin-0f35f4ddf405196a61bfc0616b82e826f1698862.tar.xz | |
Merge bitcoin/bitcoin#25786: refactor: Make adjusted time type safe
eeee5ada23f2a71d245671556b6ecfdaabfeddf4 Make adjusted time type safe (MacroFake)
fa3be799fe951a7ea9b4de78d5a907c6db71eeb8 Add time helpers (MacroFake)
Pull request description:
This makes follow-ups easier to review. Also, it makes sense by itself.
ACKs for top commit:
ryanofsky:
Code review ACK eeee5ada23f2a71d245671556b6ecfdaabfeddf4. Confirmed type changes and equivalent code changes only.
Tree-SHA512: 51bf1ae5428552177286113babdd49e82459d6c710a07b6e80a0a045d373cf51045ee010461aba98e0151d8d71b9b3b5f8f73e302d46ba4558e0b55201f99e9f
Diffstat (limited to 'src/validation.h')
| -rw-r--r-- | src/validation.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/validation.h b/src/validation.h index 324074aee9..5b71318687 100644 --- a/src/validation.h +++ b/src/validation.h @@ -336,7 +336,7 @@ bool TestBlockValidity(BlockValidationState& state, CChainState& chainstate, const CBlock& block, CBlockIndex* pindexPrev, - const std::function<int64_t()>& adjusted_time_callback, + const std::function<NodeClock::time_point()>& adjusted_time_callback, bool fCheckPOW = true, bool fCheckMerkleRoot = true) EXCLUSIVE_LOCKS_REQUIRED(cs_main); @@ -840,7 +840,7 @@ private: const CChainParams m_chainparams; - const std::function<int64_t()> m_adjusted_time_callback; + const std::function<NodeClock::time_point()> m_adjusted_time_callback; //! Internal helper for ActivateSnapshot(). [[nodiscard]] bool PopulateAndValidateSnapshot( |