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.

Sign up for GitHub

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

Jump to bottom

Add block-fetch to Diffusion tests #3852

Merged
merged 8 commits into from
Aug 19, 2022
Merged

Add block-fetch to Diffusion tests #3852

merged 8 commits into from
Aug 19, 2022

Conversation

bolt12
Copy link
Contributor

@bolt12 bolt12 commented Jun 29, 2022

Description

This PR makes it so header-body split and block-fetch run in Diffusion tests.

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

@bolt12 bolt12 requested review from nfrisby, dnadales and coot as code owners June 29, 2022 13:18
@bolt12 bolt12 linked an issue Jun 29, 2022 that may be closed by this pull request
Header body split for diffusion simulations #3773
Closed
@bolt12 bolt12 added networking testing block-fetch Issues related to block fetch component. diffusion Issues / PRs related to diffusion layer labels Jun 29, 2022
@bolt12 bolt12 force-pushed the bolt12/header-body-split branch 3 times, most recently from 7cc2dfc to 5fe30cd Compare July 4, 2022 13:47
coot
coot reviewed Jul 12, 2022
View reviewed changes
Copy link
Contributor

@coot coot left a comment

Choose a reason for hiding this comment

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

Very nice, some review comments.

ouroboros-network/src/Ouroboros/Network/BlockFetch/ClientRegistry.hs Outdated Show resolved Hide resolved
ouroboros-network/src/Ouroboros/Network/BlockFetch/ClientRegistry.hs Outdated Show resolved Hide resolved
ouroboros-network/test/Test/Ouroboros/Network/Diffusion/Node/MiniProtocols.hs Show resolved Hide resolved
ouroboros-network/test/Test/Ouroboros/Network/Diffusion/Node/NodeKernel.hs Outdated Show resolved Hide resolved
ouroboros-network/src/Ouroboros/Network/BlockFetch/Client.hs Outdated Show resolved Hide resolved
ouroboros-network/test/Test/Ouroboros/Network/Testnet/Simulation/Node.hs Show resolved Hide resolved
ouroboros-network/test/Test/Ouroboros/Network/Testnet.hs Show resolved Hide resolved
ouroboros-network/test/Test/Ouroboros/Network/Testnet.hs Show resolved Hide resolved
ouroboros-network/test/Test/Ouroboros/Network/Testnet.hs Show resolved Hide resolved
ouroboros-network/test/Test/Ouroboros/Network/Testnet.hs Show resolved Hide resolved
@bolt12 bolt12 force-pushed the bolt12/header-body-split branch 3 times, most recently from ecf2ce6 to 69ff064 Compare July 13, 2022 10:14
@bolt12 bolt12 requested a review from coot July 13, 2022 10:17
@bolt12 bolt12 force-pushed the bolt12/header-body-split branch 2 times, most recently from 5753461 to ed9eed6 Compare July 13, 2022 11:01
@bolt12 bolt12 requested review from newhoggy and a team as code owners July 13, 2022 15:28
@bolt12 bolt12 force-pushed the bolt12/header-body-split branch 2 times, most recently from fce1b24 to 2411dfd Compare July 18, 2022 10:14
coot
coot approved these changes Jul 25, 2022
View reviewed changes
Copy link
Contributor

@coot coot left a comment

Choose a reason for hiding this comment

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

LGTM

@bolt12
Copy link
Contributor Author

bolt12 commented Jul 25, 2022

@coot should I ask for someone from consensus to approve as well?

dnadales
dnadales approved these changes Jul 26, 2022
View reviewed changes
Copy link
Member

@dnadales dnadales left a comment

Choose a reason for hiding this comment

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

LGTM.

@bolt12 bolt12 force-pushed the bolt12/header-body-split branch from 2411dfd to d87bce3 Compare July 26, 2022 11:14
@bolt12 bolt12 requested a review from dnadales July 26, 2022 11:14
@bolt12
Copy link
Contributor Author

bolt12 commented Aug 5, 2022

bors retry

iohk-bors bot added a commit that referenced this pull request Aug 5, 2022
@iohk-bors @bolt12
Merge #3852
56e778b 
3852: Add block-fetch to Diffusion tests r=bolt12 a=bolt12

# Description

This PR makes it so header-body split and block-fetch run in Diffusion tests.



Co-authored-by: Armando Santos <armando@well-typed.com>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Aug 5, 2022

Build failed:

@bolt12
Copy link
Contributor Author

bolt12 commented Aug 5, 2022

bors merge

iohk-bors bot added a commit that referenced this pull request Aug 5, 2022
@iohk-bors @bolt12
Merge #3852
1b7c438 
3852: Add block-fetch to Diffusion tests r=bolt12 a=bolt12

# Description

This PR makes it so header-body split and block-fetch run in Diffusion tests.



Co-authored-by: Armando Santos <armando@well-typed.com>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Aug 5, 2022

Build failed:

@bolt12
Copy link
Contributor Author

bolt12 commented Aug 5, 2022

bors retry

iohk-bors bot added a commit that referenced this pull request Aug 5, 2022
@iohk-bors @bolt12
Merge #3852
2df7485 
3852: Add block-fetch to Diffusion tests r=bolt12 a=bolt12

# Description

This PR makes it so header-body split and block-fetch run in Diffusion tests.



Co-authored-by: Armando Santos <armando@well-typed.com>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Aug 5, 2022

Build failed:

@coot
Copy link
Contributor

coot commented Aug 10, 2022

bors merge

1 similar comment
@coot
Copy link
Contributor

coot commented Aug 12, 2022

bors merge

iohk-bors bot added a commit that referenced this pull request Aug 12, 2022
@iohk-bors @bolt12
Merge #3852
b9adb9a 
3852: Add block-fetch to Diffusion tests r=coot a=bolt12

# Description

This PR makes it so header-body split and block-fetch run in Diffusion tests.



Co-authored-by: Armando Santos <armando@well-typed.com>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Aug 12, 2022

Build failed:

@bolt12 bolt12 force-pushed the bolt12/header-body-split branch from 276588a to dde9c2d Compare August 19, 2022 09:58
@bolt12
Fixes #3935
08f0735 
In Snocket when connecting in the NormalOpen case we were putting the dual
connection (swap local and remote channels) in the network state. This is wrong
because when we read this particular 'conn' variable from the accept queue we
are going to swap the local and remote channels once again, messing things up.
@bolt12 bolt12 force-pushed the bolt12/header-body-split branch from dde9c2d to 08f0735 Compare August 19, 2022 11:26
@bolt12
Copy link
Contributor Author

bolt12 commented Aug 19, 2022

bors merge

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Aug 19, 2022

Build succeeded:

@iohk-bors iohk-bors bot merged commit 69fc48e into master Aug 19, 2022
@iohk-bors iohk-bors bot deleted the bolt12/header-body-split branch August 19, 2022 13:50
This was referenced Oct 28, 2022
Closed
Merged
iohk-bors bot added a commit that referenced this pull request Nov 9, 2022
@iohk-bors @mtullsen @coot
Merge #4120
e933084 
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 <tullsen@galois.com>
Co-authored-by: Marcin Szamotulski <coot@coot.me>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@coot coot coot approved these changes

@amesgen amesgen amesgen approved these changes

@nfrisby nfrisby Awaiting requested review from nfrisby

@newhoggy newhoggy Awaiting requested review from newhoggy

@dnadales dnadales Awaiting requested review from dnadales

Assignees
No one assigned
Labels
block-fetch Issues related to block fetch component. diffusion Issues / PRs related to diffusion layer testing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Header body split for diffusion simulations
4 participants
@bolt12 @coot @dnadales @amesgen