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

Consolidate protocol parameters across eras #282

Merged
merged 1 commit into from
Aug 16, 2023
Merged

Consolidate protocol parameters across eras #282

merged 1 commit into from
Aug 16, 2023

Conversation

jorisdral
Copy link
Contributor

@jorisdral jorisdral commented Aug 9, 2023 •
edited
Loading

Description

Closes IntersectMBO/ouroboros-network#275.

This PR adds a new ProtocolParams data family, with instances for all Byron and Shelley blocks, and an instance for the Cardano block. This simplies protocolInfoCardano because per-era protocol parameter arguments are now bundled in the Cardano ProtocolParams type.

Tip: hiding whitespace should make the reviewable diff smaller.

See #282 (review), which discusses possible follow-up issues for other improvements to protocolInfoCardano.

@jorisdral jorisdral added the enhancement New feature or request label Aug 9, 2023
@jorisdral jorisdral self-assigned this Aug 9, 2023
@jorisdral jorisdral force-pushed the jdral/275-consolidate-protocolparams-across-eras branch from a83f47a to 46a8f51 Compare August 10, 2023 09:34
jorisdral
jorisdral commented Aug 10, 2023
View reviewed changes
Copy link
Contributor Author

@jorisdral jorisdral left a comment

Choose a reason for hiding this comment

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

I left some INFO comments, some remarks for me to resolve, and some questions for reviewers to consider

ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/Node.hs Show resolved Hide resolved
ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Node.hs Show resolved Hide resolved
ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Node/Praos.hs Outdated Show resolved Hide resolved
ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Node.hs Show resolved Hide resolved
ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Node/Praos.hs Show resolved Hide resolved
ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Node/Praos.hs Show resolved Hide resolved
ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano.hs Show resolved Hide resolved
ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs Outdated Show resolved Hide resolved
ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs Outdated Show resolved Hide resolved
ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs Show resolved Hide resolved
jorisdral
jorisdral commented Aug 10, 2023
View reviewed changes
Copy link
Contributor Author

@jorisdral jorisdral left a comment

Choose a reason for hiding this comment

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

Included some notes about follow-up issues.

ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs Outdated Show resolved Hide resolved
ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs Show resolved Hide resolved
@jorisdral jorisdral marked this pull request as ready for review August 10, 2023 09:56
@jorisdral jorisdral requested a review from a team as a code owner August 10, 2023 09:56
@jorisdral
Copy link
Contributor Author

This PR is missing a changelog entry.

dnadales
dnadales approved these changes Aug 10, 2023
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!

@jorisdral
Copy link
Contributor Author

I've just pushed a commit, which also puts transition parameters inside the cardano protocol parameters. Let me know what you think @nfrisby @dnadales @amesgen

@jorisdral jorisdral force-pushed the jdral/275-consolidate-protocolparams-across-eras branch 4 times, most recently from e565a87 to e4518b5 Compare August 15, 2023 09:42
@jorisdral
Consolidated protocol parameters
c3efad2 
* Add ProtocolParams data family and instances for each era
* Add ProtocolTransitionParams data family and instances for each transition
* ProtocolParams for cardano block
* Record syntax for CardanoProtocolParams
@jorisdral jorisdral force-pushed the jdral/275-consolidate-protocolparams-across-eras branch from e4518b5 to c3efad2 Compare August 15, 2023 10:49
@jorisdral jorisdral added this pull request to the merge queue Aug 16, 2023
Merged via the queue into main with commit 360ef94 Aug 16, 2023
12 checks passed
@jorisdral jorisdral deleted the jdral/275-consolidate-protocolparams-across-eras branch August 16, 2023 09:56
This was referenced Aug 23, 2023
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amesgen amesgen amesgen left review comments

@nfrisby nfrisby nfrisby left review comments

@dnadales dnadales dnadales approved these changes

Assignees

@jorisdral jorisdral

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jorisdral @dnadales @nfrisby @amesgen