Continue preparing the for the introduction of AlonzoEra #3131
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nfrisby
force-pushed
the
nfrisby/alonzo-preparation-2
branch
from
00c3321
to
32b8484
Compare
|
This is a Draft PR because it should be rebased and then merged after we merge PR #3130. |
jasagredo
reviewed
May 12, 2021
ouroboros-consensus-shelley-test/src/Test/Consensus/Shelley/MockCrypto.hs
Outdated
Show resolved
Hide resolved
nfrisby
force-pushed
the
nfrisby/alonzo-preparation-2
branch
from
32b8484
to
ff697ca
Compare
jasagredo
reviewed
May 13, 2021
Closed
nfrisby
force-pushed
the
nfrisby/alonzo-preparation-2
branch
3 times, most recently
from
4fccf5a
to
5201d9c
Compare
nfrisby
commented
May 13, 2021
ouroboros-consensus-cardano-test/src/Test/ThreadNet/Infra/ShelleyBasedHardFork.hs
Show resolved
Hide resolved
nfrisby
commented
May 13, 2021
nfrisby
force-pushed
the
nfrisby/alonzo-preparation-2
branch
from
5201d9c
to
457e7f0
Compare
nfrisby
commented
May 13, 2021
This is a temporary workaround; the AlonzoEra does not satisfy CanMockPreAlonzo, so we cannot use CanMockPreAlonzo for instances that are elsewhere required for each element of CardanoEras. Thankfully, only these uses of CanMockPreAlonzo need the Alonzo-incompatible constraints, and these three are also not requires of CardanoEras.
The motivation is to bring in the NoThunks AlonzoGenesis instance and the TranslationContext (ShelleyEra c) ~ () instance.
nfrisby
force-pushed
the
nfrisby/alonzo-preparation-2
branch
from
457e7f0
to
2b8ed44
Compare
nfrisby
commented
May 14, 2021
ouroboros-consensus-cardano-test/src/Test/Consensus/Cardano/Generators.hs
Show resolved
Hide resolved
nfrisby
force-pushed
the
nfrisby/alonzo-preparation-2
branch
from
2b8ed44
to
98396bf
Compare
EncodePanda
approved these changes
May 14, 2021
ouroboros-consensus-shelley-test/src/Test/Consensus/Shelley/Examples.hs
Outdated
Show resolved
Hide resolved
ouroboros-consensus-cardano-test/src/Test/ThreadNet/Infra/ShelleyBasedHardFork.hs
Outdated
Show resolved
Hide resolved
ouroboros-consensus-cardano/src/Ouroboros/Consensus/Cardano/Node.hs
Outdated
Show resolved
Hide resolved
Alonzo is the first era with a `TranslationContext` that is not `()`. Therefore, this commit must pipe through the `TranslationContext` through to the calls to `translateEra`. In particular, some of this are in classes used by the HFC in which the only era-specific input is the `LedgerConfig`. For that reason, we're adding `TranslationContext` to `ShelleyLedgerConfig`. It's possible we should instead alter the HFC to carry something in addition to/instead of the `LedgerConfig`, but we're taking the direct path for now. By adding a field to the `ShelleyLedgerConfig` we take on the burden of providing that `TranslationContext` in every interface and/or test function that creates a Shelley protocol info etc. This is noisy but simple, since all eras before `AlonzoEra` just use `()` for their context.
nfrisby
force-pushed
the
nfrisby/alonzo-preparation-2
branch
from
98396bf
to
67751c9
Compare
nfrisby
force-pushed
the
nfrisby/alonzo-preparation-2
branch
from
67751c9
to
ed24dfa
Compare
|
bors r+ |
|
Build failed: |
|
The Hydra build timed out on the mac-mini again b/c of Issue IntersectMBO/ouroboros-consensus#606. I restarted it 🤞 Edit: and it succeeded -- but |
|
bors r+ |
|
Build succeeded: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR introduces the changes that then allow us to add
AlonzoErato theCardanoEraslist.