Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix diffusion simulation error #3904

Merged
merged 5 commits into from
Jul 16, 2022
Merged

Conversation

coot
Copy link
Contributor

@coot coot commented Jul 15, 2022

Description

Fix the prop_diffusion_target_active_local_above and do a bit refactoring of
the diffusion tests to make it easier to run quickcheck diffusion simulations
in GHCi.

Fixes #3900.

Checklist

  • Branch
    • Commit sequence broadly makes sense
    • Commits have useful messages
    • New tests are added if needed and existing tests are updated
    • If this branch changes Consensus and has any consequences for downstream repositories or end users, said changes must be documented in interface-CHANGELOG.md
    • If this branch changes Network and has any consequences for downstream repositories or end users, said changes must be documented in interface-CHANGELOG.md
    • If serialization changes, user-facing consequences (e.g. replay from genesis) are confirmed to be intentional.
  • Pull Request
    • Self-reviewed the diff
    • Useful pull request description at least containing the following information:
      • What does this PR change?
      • Why these changes were needed?
      • How does this affect downstream repositories and/or end-users?
      • Which ticket does this PR close (if any)? If it does, is it linked?
    • Reviewer requested

coot added 5 commits July 15, 2022 16:28
The show instance for `StdGen` does not allow to reconstruct it (the
constructor is private), for this reason it's much better to pass the
seed itself.   This allows one to execute the failed case.
This is done in order to make the serialised version more usable when
pasting from the console to a Haskell file.

The changes touch:

* 'TestAddress'
* 'RelayAccessPoint'
* 'NtNAddr_'
* 'SimArg'
* 'Command'

Surround 'IP' address in `"` so it is a valid string.  One still needs
to add `read` in front of an IP address.  For domain names, one can just
enable 'OverloadedString' extension.
Now it's enough to just import
Test.Ouroboros.Network.Testnet.Simulation.Node to get everything in
scope for SimArgs.  This makes it much easier to work with specific test
failures reported by quickcheck.
Increased the interval for which we allow the local targets to be above
the limit to 15 seconds.

Fixed #3900
@coot coot requested a review from bolt12 July 15, 2022 14:43
Copy link
Contributor

@bolt12 bolt12 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, thanks! LGTM

@coot
Copy link
Contributor Author

coot commented Jul 16, 2022

bors merge

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jul 16, 2022

@iohk-bors iohk-bors bot merged commit a6e2a32 into master Jul 16, 2022
@iohk-bors iohk-bors bot deleted the coot/diffusion-local-root-peers branch July 16, 2022 09:01
iohk-bors bot added a commit that referenced this pull request Nov 9, 2022
4120: Cherry picked network changes for cardano-node-1.35.5 release r=coot a=coot

This cherry-picked patches from the following PRs:

* #3794
* #3844
* #3785
* #3904
* #3915
* #3852
* #3970
* #3979
* #4015
* #4067
* #4004
* #4086
* #4113
* #4106
* #4127
* #4103

Also cherry-picked almost all the commits which modify GitHub actions:
* 18c5244 Run GitHub Actions on pull requests   
* 3adf5a9 Use newer version of io-sim           
* ee9b7a6 Fix GH Actions Windows CI: switch from pkgconf to pkg-config 
* e6cf074 github-actions: use `ubuntu-latest`   
* 9a8b959 Updated versions of github actions    
* fc8f8f0 Fix GH Actions Windows CI caching     
* 7f07c40 Windows Github Actions now use MSYS2  
* b21a7ce Fix chocolatey CI error
* #4134               

TODO:

* [x] bump versions of packages
* [x] input-output-hk/cardano-haskell-packages#84

Co-authored-by: Mark Tullsen <[email protected]>
Co-authored-by: Marcin Szamotulski <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Diffusion outbound governor test failure: target active local above
2 participants