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

Simplify tally and ppup states #3279

Merged
merged 2 commits into from
Feb 6, 2023
Merged

Simplify tally and ppup states #3279

merged 2 commits into from
Feb 6, 2023

Conversation

lehins
Copy link
Collaborator

@lehins lehins commented Feb 3, 2023 •
edited
Loading

Description

Replace TallyState and PPUPState with GovernanceState:

  • Remove PPUPState from Shelley
  • Add EraGovernance instead of EraTallyState
  • Adjust golden test for ledger state encoding to account for tally state removal
  • adjust changelog, while removing entries that weren't yet released
  • Remove wrong constraint: HashAnnotated (TxBody era) EraIndependentTxBody (EraCrypto era) in ledger state instances

Checklist

  • Commit sequence broadly makes sense
  • Commits have useful messages
  • New tests are added if needed and existing tests are updated
  • Any changes are noted in the changelog
  • Code is formatted with fourmolu (which can be run with scripts/fourmolize.sh
  • Self-reviewed the diff

@lehins lehins changed the title Lehins/splify tally and ppup Lehins/simplify tally and ppup Feb 3, 2023
@JaredCorduan
Copy link
Contributor

I'm for it @lehins ! let me know when it's ready for a proper review and I'll take a much closer look, thanks!

@lehins lehins force-pushed the lehins/splify-tally-and-ppup branch from b62c636 to 0f5de29 Compare February 6, 2023 18:54
@lehins lehins marked this pull request as ready for review February 6, 2023 19:56
@lehins lehins force-pushed the lehins/splify-tally-and-ppup branch from 0f5de29 to 8d23cd7 Compare February 6, 2023 20:35
@lehins lehins changed the title Lehins/simplify tally and ppup Simplify tally and ppup Feb 6, 2023
@lehins lehins changed the title Simplify tally and ppup Simplify tally and ppup states Feb 6, 2023
@lehins lehins force-pushed the lehins/splify-tally-and-ppup branch from 8d23cd7 to e7a76b1 Compare February 6, 2023 20:39
JaredCorduan
JaredCorduan approved these changes Feb 6, 2023
View reviewed changes
Copy link
Contributor

@JaredCorduan JaredCorduan left a comment

Choose a reason for hiding this comment

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

looks great Alexey, I think it's definitely worth having the goverance state in a slight weird place in order to make the code this much cleaner and to remove all those constraints. thanks! (I made lots of small comments, but nothing of importance).

@lehins
Replace TallyState and PPUPState with GovernanceState:
b746ca8 
* Remove PPUPState from Shelley
* Add `EraGovernance` instead of `EraTallyState`
* Adjust golden test for `LedgerState` encoding to account for tally state removal
* adjust changelog
@lehins lehins force-pushed the lehins/splify-tally-and-ppup branch from e7a76b1 to b746ca8 Compare February 6, 2023 21:00
@lehins lehins merged commit ac405a9 into master Feb 6, 2023
@iohk-bors iohk-bors bot deleted the lehins/splify-tally-and-ppup branch February 6, 2023 22:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JaredCorduan JaredCorduan JaredCorduan approved these changes

@Soupstraw Soupstraw Awaiting requested review from Soupstraw

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@lehins @JaredCorduan