This repository has been archived by the owner on Aug 18, 2020. It is now read-only.
[release/1.3.1] [CO-354] Add RequiresNetworkMagic and modify ProtocolMagic
#3556
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
Add `RequiresNetworkMagic` datatype and `requiresNetworkMagic` field to `ProtocolMagic`. Pull `Int32` of ProtocolMagic into a newtype wrapper `ProtocolMagicId`. Push modified `ProtocolMagic` through the codebase. Modify `GenericBlockHeader` to use `ProtocolMagicId` instead of `ProtocolMagic`, to avoid issues of undefined `requiresNetworkMagic` when reading a block.
intricate
requested review from
adinapoli-iohk,
denisshevchenko,
parsonsmatt and
vincenthz
as code owners
erikd
reviewed
Sep 7, 2018
|
|
||
| import Test.Pos.Block.Arbitrary.Generate (generateMainBlock) | ||
|
|
||
| -- We need 'ProtocolMagic' and 'ProtocolConstants' in order to generate a | ||
| -- 'MainBlock'. | ||
|
|
||
| pm :: ProtocolMagic | ||
| pm = ProtocolMagic 0 | ||
| pm = ProtocolMagic (ProtocolMagicId 0) NMMustBeNothing |
This was referenced Sep 7, 2018
ruhatch
reviewed
Sep 7, 2018
| toJSON NMMustBeNothing = pure (JSString "NMMustBeNothing") | ||
| toJSON NMMustBeJust = pure (JSString "NMMustBeJust") | ||
|
|
||
| instance ReportSchemaErrors m => FromJSON m RequiresNetworkMagic where |
There was a problem hiding this comment.
If you replace ReportSchemaErrors m with (Monad m, MonadError SchemaError m) then you can drop -fno-simplifiable-class-constraints
There was a problem hiding this comment.
Thanks! Will apply this on develop.
There was a problem hiding this comment.
@ruhatch Interesting. Will look to make this change.
ruhatch
approved these changes
Sep 7, 2018
|
@ruhatch Oh, for sure!! |
|
@ruhatch @intricate For better or worse, we began most of this work on |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Description
This PR modifies the
ProtocolMagicdata structure and introduces new data types:RequiresNetworkMagicandProtocolMagicId(a new type wrapper around anInt32).ProtocolMagichas been modified such that it consists of two fields:getProtocolMagicId :: ProtocolMagicIdandgetRequiresNetworkMagic :: RequiresNetworkMagic.The
goldenTestJSONDecandgoldenTestCanonicalJSONDectests which were introduced in #3540 have assisted us in ensuring that we've maintained backwards compatibility in our implementation ofProtocolMagic.Linked issue
https://iohk.myjetbrains.com/youtrack/issue/CO-354
Type of change
Developer checklist
Testing checklist
QA Steps
Screenshots (if available)