-
Notifications
You must be signed in to change notification settings - Fork 732
Restore Package Sanity #4600
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
Restore Package Sanity #4600
Conversation
This is DRAFT. A second part that "reverts" 9d729d8 and properly add ledger/1.1.0, as well as some proper network release are still missing. |
@@ -26,7 +26,7 @@ genesisFunds :: forall era. IsShelleyBasedEra era | |||
=> NetworkId -> ShelleyGenesis StandardShelley -> [(AddressInEra era, Lovelace)] | |||
genesisFunds networkId g | |||
= map (castAddr *** fromShelleyLovelace) | |||
$ ListMap.toList | |||
$ Map.toList |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This removes an optimization. Do you intend to merge this PR into master?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Jimbo4350 it does. It's basically going back to ledger/1.0.0.
My tentative plan is to next bump ledger to the 1.1.0 release, (and have a proper CHaP release) for it.
Then bump network to some release, though the situation there looks much less clear to me.
And then revert 9d729d8, at which point this is hopefully much closer to where we are today with master.
If we can re-arrange the imports in a way to get ListMap from ledger/1.0.0, that would help reduce the carnage introduced in 9d729d8
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That being said, if we can come to an agreement that we revert to ledger/1.0.0 and the network as per 1.35.4 for now in master. And then have a second PR to try and bring in new released dependencies of ledger and network, that would certainy help. But it does mean we'll go back in time a bit.
9d729d8
to
0b9d7f1
Compare
bors r- |
@deepfire please do not try to merge this PR. |
This uses CHaP as per the 1.35.4 release. This is meant to be the basis from which we add (proper) leder and network releases, to rever the commit that made this one barely compile.
This temporarily restores sanity by removing any dependency on ledger past 1.0.0 (what is in CHaP right now). It therefore also reverts the network bump. ! This commit is meant to be temporary. And to be reverted ontop of a sane CHaP'ified master.
This reverts commit ce3925e.
This is DRAFT.
A second part that "reverts" 9d729d8 and properly add ledger/1.1.0, as well as some proper network release are still missing.