backport: bitcoin#18638#6103
Merged
PastaPastaPasta merged 2 commits intodashpay:developfrom Jul 15, 2024
Merged
Conversation
fa33654 net: Use mockable time for ping/pong, add tests (MarcoFalke) faab4aa util: Add count_microseconds helper (MarcoFalke) Pull request description: Switch `CNode::m_ping_start` and `CNetMessage::m_time` to mockable time, so that tests can be added. Mockable time is also type-safe, since it uses `std::chrono` ACKs for top commit: jonatack: Code review re-ACK fa33654 re-read code, verified rebase per `git range-diff 4b5c919 fa94d6f fa33654`, previous tested ACKs still valid troygiorshev: ACK fa33654 Tree-SHA512: 7d632bd6019ce7c882029e71b667a61517e783af82755a85dd979ef09380934e172dec8b8f91d57b200a30a6e096aeaf01f19fee7f3aed0e0e871c72eb44d70e
UdjinM6
requested changes
Jul 9, 2024
UdjinM6
left a comment
UdjinM6
left a comment
There was a problem hiding this comment.
rpc_net.py is failing - looks like we don't need extra pings anymore d04b16a (CI https://gitlab.com/UdjinM6/dash/-/pipelines/1364958120)
UdjinM6
approved these changes
Jul 10, 2024
5 tasks
PastaPastaPasta
added a commit
that referenced
this pull request
Aug 1, 2024
764b3a3 test: disable mocktime in p2p_eviction.py (UdjinM6) Pull request description: ## Issue being fixed or feature implemented No idea why CI has no issues but `p2p_eviction.py` fails locally after #6103 (my guess is that it's because P2PInterface can't work with mocktime properly). ## What was done? Disable mocktime in `p2p_eviction.py` ## How Has This Been Tested? Run tests locally ## Breaking Changes n/a ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ Top commit has no ACKs. Tree-SHA512: a9be9032c7697ff47b2256395f0fb126deeccd9bee6f101a71a1f88e1f25b08fa039ed5eb4cd4b1b308e8136d64510a544b7019ed9147ea2e80f8cb83ff25412
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Issue being fixed or feature implemented
Split from #6102
What was done?
So far as bitcoin#19499 is backported, bitcoin#18638 can be finished and removed related workarounds.
How Has This Been Tested?
Run unit/functional tests
Breaking Changes
N/A
Checklist: