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

Incorporate byron votes and proposals into cardano-api #2209

Merged
merged 2 commits into from
Jan 5, 2021
Merged

Incorporate byron votes and proposals into cardano-api #2209

merged 2 commits into from
Jan 5, 2021

Conversation

Jimbo4350
Copy link
Contributor

No description provided.

@Jimbo4350 Jimbo4350 force-pushed the jordan/incorporate-byron-votes-and-proposals-api branch from 7a1a798 to 3199e63 Compare December 11, 2020 12:45
dcoutts
dcoutts requested changes Dec 11, 2020
View reviewed changes
Copy link
Contributor

@dcoutts dcoutts left a comment

Choose a reason for hiding this comment

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

Looking good! This is what I had in mind, and it should make the CLI quite a bit nicer.

Main thing below is simplifying the serialisation story so we can use the existing serialisation classes.

The other one is non-essential. A TODO is enough for that one.

cardano-api/src/Cardano/Api/SpecialByron.hs Outdated Show resolved Hide resolved
cardano-api/src/Cardano/Api/SpecialByron.hs Outdated Show resolved Hide resolved
@Jimbo4350 Jimbo4350 force-pushed the jordan/incorporate-byron-votes-and-proposals-api branch 3 times, most recently from 414216b to 71f8f5a Compare December 14, 2020 12:24
dcoutts
dcoutts reviewed Dec 14, 2020
View reviewed changes
Copy link
Contributor

@dcoutts dcoutts left a comment

Choose a reason for hiding this comment

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

Looking good.

I think it'd be worth trying and seeing if using () rather than ByteString for the annotation type might make the serialisation code work out more easily.

That is, instead of AProposal ByteString, try Proposal, and similarly for the votes.

cardano-api/src/Cardano/Api/SpecialByron.hs Outdated Show resolved Hide resolved
cardano-api/src/Cardano/Api/SpecialByron.hs Outdated Show resolved Hide resolved
cardano-api/src/Cardano/Api/SpecialByron.hs Show resolved Hide resolved
cardano-api/src/Cardano/Api/SpecialByron.hs Outdated Show resolved Hide resolved
@Jimbo4350 Jimbo4350 force-pushed the jordan/incorporate-byron-votes-and-proposals-api branch from 71f8f5a to f40f547 Compare December 16, 2020 13:53
@Jimbo4350 Jimbo4350 marked this pull request as ready for review December 16, 2020 13:56
@Jimbo4350 Jimbo4350 force-pushed the jordan/incorporate-byron-votes-and-proposals-api branch from f40f547 to 550c8c6 Compare December 16, 2020 14:00
dcoutts
dcoutts approved these changes Dec 17, 2020
View reviewed changes
Copy link
Contributor

@dcoutts dcoutts left a comment

Choose a reason for hiding this comment

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

Nice!

cardano-api/src/Cardano/Api/SpecialByron.hs Show resolved Hide resolved
cardano-api/src/Cardano/Api/SpecialByron.hs Outdated Show resolved Hide resolved
cardano-api/src/Cardano/Api/SpecialByron.hs Show resolved Hide resolved
cardano-api/src/Cardano/Api/SpecialByron.hs Outdated Show resolved Hide resolved
@Jimbo4350 Jimbo4350 force-pushed the jordan/incorporate-byron-votes-and-proposals-api branch from 550c8c6 to b00f896 Compare December 17, 2020 11:01
@Jimbo4350 Jimbo4350 force-pushed the jordan/incorporate-byron-votes-and-proposals-api branch from b00f896 to 5e3b214 Compare December 17, 2020 14:37
@Jimbo4350 Jimbo4350 force-pushed the jordan/incorporate-byron-votes-and-proposals-api branch from 5e3b214 to 7725e67 Compare December 17, 2020 15:43
@Jimbo4350 Jimbo4350 force-pushed the jordan/incorporate-byron-votes-and-proposals-api branch from 7725e67 to 43f667f Compare December 29, 2020 10:23
@Jimbo4350 Jimbo4350 force-pushed the jordan/incorporate-byron-votes-and-proposals-api branch 2 times, most recently from da587ba to 2391234 Compare December 29, 2020 12:05
@Jimbo4350 Jimbo4350 force-pushed the jordan/incorporate-byron-votes-and-proposals-api branch from 2391234 to 0b98522 Compare December 30, 2020 09:28
@mkoura
Copy link
Contributor

mkoura commented Jan 5, 2021

I successfully tested this change by moving Byron -> Shelley -> Allegra -> Mary using the the scripts/byron-to-mary.

@Jimbo4350
Copy link
Contributor Author

bors merge

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jan 5, 2021

Build succeeded:

@iohk-bors iohk-bors bot merged commit d56e0dd into master Jan 5, 2021
@iohk-bors iohk-bors bot deleted the jordan/incorporate-byron-votes-and-proposals-api branch January 5, 2021 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@intricate intricate intricate left review comments

@dcoutts dcoutts dcoutts approved these changes

@erikd erikd Awaiting requested review from erikd

@mrBliss mrBliss Awaiting requested review from mrBliss

@newhoggy newhoggy Awaiting requested review from newhoggy

@ArturWieczorek ArturWieczorek Awaiting requested review from ArturWieczorek

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

Successfully merging this pull request may close these issues.
4 participants
@Jimbo4350 @mkoura @dcoutts @intricate