remove annotators from PParams FromCBOR instances #2190
Merged
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
JaredCorduan
force-pushed
the
jc/remove-pparam-annotators
branch
from
6cf05ac
to
fe69982
Compare
redxaxder
reviewed
Mar 22, 2021
| @@ -507,13 +491,12 @@ pattern OtherView n <- LangDepViewConstr (Memo (RawOtherView cm) _) | |||
|
|
|||
| {-# COMPLETE PlutusView {- OtherView -} #-} | |||
|
|
|||
| instance (Typeable era) => FromCBOR (Annotator (LangDepView era)) where | |||
| instance (Typeable era) => FromCBOR (LangDepView era) where | |||
There was a problem hiding this comment.
This is probably never used
redxaxder
reviewed
Mar 22, 2021
| FromCBOR (PParamsDelta era), | ||
| ToCBOR (PParamsDelta era) | ||
| ) => | ||
| FromCBOR (Annotator (TxBodyRaw era)) |
There was a problem hiding this comment.
Any site using this instance is probably doing something wrong
This is to satisfy the constraints of the FromCBOR instance of Mem
redxaxder
reviewed
Mar 22, 2021
| @@ -165,16 +164,22 @@ deriving instance | |||
| (NoThunks (Value era), NoThunks (PParamsDelta era)) => | |||
| NoThunks (TxBodyRaw era) | |||
|
|
|||
| instance (FamsFrom era) => FromCBOR (Annotator (TxBodyRaw era)) where | |||
| instance (FamsFrom era) => FromCBOR (TxBodyRaw era) where | |||
redxaxder
reviewed
Mar 22, 2021
| bodyFields | ||
| [(0, "inputs"), (1, "outputs"), (2, "txfee")] | ||
| ) | ||
|
|
||
| instance | ||
| (FamsFrom era) => | ||
| FromCBOR (Annotator (TxBodyRaw era)) |
There was a problem hiding this comment.
This instance is [not] sketch
redxaxder
approved these changes
Mar 22, 2021
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.
I have exchanged all the
FromCBOR (Annotator PParams)instances forFromCBOR PParamsinstances, in all eras. And similarly all the type up toNewEpochStatethat were forced to be annotated due to thePParams.(This PR does not make the change so that the language view of the parameters stores it's own hash, I'll do that next).