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

Indicate that tag 258 is optional for OSet. Fix rational CDDL #3869

Merged
merged 3 commits into from
Nov 13, 2023

Conversation

lehins
Copy link
Collaborator

@lehins lehins commented Nov 13, 2023

Description

  • Removed mock/crypto.cddl, added optional tag to sets #3860 added optional 258 tags to sets, but not the oset in CDDL. This PR fixes that ommission
  • Fix definition of rational in CDDL. It is no longer non-negative
  • Remove positive_rational in favor of new nonnegative_rational, since that is the actual type that is used in PParams
  • Switch ppCommitteeMaxTermLength to EpochNo, rather than Natural

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

@lehins lehins requested a review from Soupstraw November 13, 2023 16:38
@lehins lehins force-pushed the lehins/tag258-oset-optional-in-cddl branch from 90a458a to 62ca2a8 Compare November 13, 2023 16:40
Copy link
Contributor

@TimSheard TimSheard left a comment

Choose a reason for hiding this comment

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

Looks good, but I question why we changed from Natural to EpochNo

eras/conway/impl/CHANGELOG.md Show resolved Hide resolved
eras/conway/impl/cddl-files/extra.cddl Show resolved Hide resolved
@lehins lehins force-pushed the lehins/tag258-oset-optional-in-cddl branch from 62ca2a8 to 3665a4e Compare November 13, 2023 20:56
@lehins lehins enabled auto-merge November 13, 2023 20:56
Copy link
Contributor

@teodanciu teodanciu left a comment

Choose a reason for hiding this comment

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

Looks good to me

@lehins lehins merged commit dd75231 into master Nov 13, 2023
@iohk-bors iohk-bors bot deleted the lehins/tag258-oset-optional-in-cddl branch November 13, 2023 22:52
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.

3 participants