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

Use a Data.OMap.Strict to replace ProposalsSnapshot #3791

Merged
merged 8 commits into from
Nov 1, 2023

Conversation

aniketd
Copy link
Contributor

@aniketd aniketd commented Oct 12, 2023

Description

Closes #3789

Checklist

  • Commit sequence broadly makes sense and commits have useful messages
  • New tests are added if needed and existing tests are updated
  • When applicable, versions are updated in .cabal and CHANGELOG.md files according to the
    versioning process.
  • The version bounds in .cabal files for all affected packages are updated. If you change the bounds in a cabal file, that package itself must have a version increase. (See RELEASING.md)
  • All visible changes are prepended to the latest section of a CHANGELOG.md for the affected packages. New section is never added with the code changes. (See RELEASING.md)
  • Code is formatted with fourmolu (use scripts/fourmolize.sh)
  • Cabal files are formatted (use scripts/cabal-format.sh)
  • hie.yaml has been updated (use scripts/gen-hie.sh)
  • Self-reviewed the diff

@aniketd aniketd changed the title Add Data.OMap.Strict to cardano-data Use a Data.OMap.Strict to replace ProposalsSnapshot Oct 12, 2023
@aniketd aniketd force-pushed the aniketd/omap-proposals-snapshot branch 2 times, most recently from 8ab8cec to 35c4175 Compare October 20, 2023 13:36
@aniketd aniketd marked this pull request as ready for review October 20, 2023 13:37
@aniketd aniketd force-pushed the aniketd/omap-proposals-snapshot branch from c3d7100 to aed1589 Compare October 25, 2023 14:15
@aniketd aniketd force-pushed the aniketd/omap-proposals-snapshot branch from aed1589 to 0093b6f Compare October 25, 2023 14:29
Copy link
Contributor

@lehins lehins left a comment

Choose a reason for hiding this comment

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

There is an unfortunate problem with the decision of using a SSeq of v instead of SSeq of k. I commented on the actual location where the problem is. We can discuss tomorrow some possible solutions

libs/cardano-data/src/Data/OMap/Strict.hs Outdated Show resolved Hide resolved
libs/cardano-data/src/Data/OMap/Strict.hs Outdated Show resolved Hide resolved
libs/cardano-data/src/Data/OMap/Strict.hs Outdated Show resolved Hide resolved
libs/cardano-data/src/Data/OMap/Strict.hs Outdated Show resolved Hide resolved
libs/cardano-data/src/Data/OMap/Strict.hs Outdated Show resolved Hide resolved
libs/cardano-data/src/Data/OMap/Strict.hs Outdated Show resolved Hide resolved
libs/cardano-data/src/Data/OMap/Strict.hs Outdated Show resolved Hide resolved
@aniketd aniketd force-pushed the aniketd/omap-proposals-snapshot branch from 0093b6f to 4ab174c Compare October 26, 2023 20:37
@aniketd aniketd requested a review from lehins October 26, 2023 20:37
@aniketd aniketd force-pushed the aniketd/omap-proposals-snapshot branch 4 times, most recently from 7049e56 to 8d59f07 Compare October 30, 2023 17:23
Copy link
Contributor

@lehins lehins left a comment

Choose a reason for hiding this comment

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

Sorry, I didn't look closely enough last time. A whole bunch more comments.

libs/cardano-data/src/Data/OMap/Strict.hs Outdated Show resolved Hide resolved
libs/cardano-data/src/Data/OMap/Strict.hs Outdated Show resolved Hide resolved
libs/cardano-data/src/Data/OMap/Strict.hs Show resolved Hide resolved
libs/cardano-data/src/Data/OMap/Strict.hs Outdated Show resolved Hide resolved
libs/cardano-data/src/Data/OMap/Strict.hs Outdated Show resolved Hide resolved
libs/cardano-data/testlib/Test/Cardano/Data/Arbitrary.hs Outdated Show resolved Hide resolved
@aniketd aniketd force-pushed the aniketd/omap-proposals-snapshot branch from 8d59f07 to 9a07dac Compare October 31, 2023 15:38
@aniketd aniketd requested a review from lehins October 31, 2023 15:39
@aniketd aniketd force-pushed the aniketd/omap-proposals-snapshot branch from 9a07dac to fab43fc Compare October 31, 2023 15:50
Copy link
Contributor

@lehins lehins left a comment

Choose a reason for hiding this comment

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

Dammit, I reviewed the PR last night, but forgot to hit Submit Review

Looks much better. Couple of minor points still exist, but they should be easy to fix

libs/cardano-data/src/Data/OMap/Strict.hs Outdated Show resolved Hide resolved
libs/cardano-data/src/Data/OMap/Strict.hs Outdated Show resolved Hide resolved
libs/cardano-data/src/Data/OMap/Strict.hs Outdated Show resolved Hide resolved
@aniketd aniketd force-pushed the aniketd/omap-proposals-snapshot branch from fab43fc to 11b3410 Compare November 1, 2023 10:52
@aniketd aniketd requested a review from lehins November 1, 2023 12:59
Copy link
Contributor

@lehins lehins left a comment

Choose a reason for hiding this comment

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

Perfect! 👍

@lehins lehins enabled auto-merge November 1, 2023 13:12
@lehins lehins disabled auto-merge November 1, 2023 13:13
@lehins lehins enabled auto-merge (squash) November 1, 2023 13:13
@lehins lehins force-pushed the aniketd/omap-proposals-snapshot branch from 0742eb6 to 89af4f3 Compare November 1, 2023 15:36
@lehins lehins merged commit b558f5c into master Nov 1, 2023
8 of 39 checks passed
@iohk-bors iohk-bors bot deleted the aniketd/omap-proposals-snapshot branch November 1, 2023 19:29
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.

OMap for ProposalsSnapshot
2 participants