This repository has been archived by the owner on Aug 18, 2020. It is now read-only.
[release/1.3.1] [CO-354] Override RequiresNetworkMagic from CoreConfiguration #3659
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
intricate
force-pushed
the
intricate+mhuesch/CO-354/core-config-rnm
branch
2 times, most recently
from
174fbf8 to
e6a679f
Compare
intricate
force-pushed
the
intricate+mhuesch/CO-354/core-config-rnm
branch
4 times, most recently
from
d8a0928 to
d8ebf20
Compare
intricate
force-pushed
the
intricate+mhuesch/CO-354/core-config-rnm
branch
from
d8ebf20 to
fd4b172
Compare
mhuesch
previously approved these changes
Sep 24, 2018
| parseJSON = withObject "core" $ \obj -> do | ||
| ccg <- obj .: "genesis" | ||
| ccdsv <- obj .: "dbSerializeVersion" | ||
| ccrnm <- determineRNM <$> obj .:? "requiresNetworkMagic" |
There was a problem hiding this comment.
I think this line can be replaced with (docs)
ccrnm <- obj .:? "requiresNetworkMagic" .!= NMMustBeJust
whether that is more or less readable is another question 🙃
There was a problem hiding this comment.
It would be neater to use .!= as you suggest, and then add a comment to highlight the subtlety.
-- If "requiresNetworkMagic" is not specified, default to NMMustBeJust
ccrnm <- obj .:? "requiresNetworkMagic" .!= NMMustBeJust
lib/src/Test/Pos/Helpers.hs
Outdated
| :: forall a. (IdTestingRequiredClassesAlmost a, ToAndFromCanonicalJson a) | ||
| => Gen a | ||
| -> Spec | ||
| canonicalJsonTest' genA = |
There was a problem hiding this comment.
Would canonicalJsonTestWithGen or something similar be a more descriptive name?
rvl
previously approved these changes
Sep 25, 2018
| parseJSON = withObject "core" $ \obj -> do | ||
| ccg <- obj .: "genesis" | ||
| ccdsv <- obj .: "dbSerializeVersion" | ||
| ccrnm <- determineRNM <$> obj .:? "requiresNetworkMagic" |
There was a problem hiding this comment.
It would be neater to use .!= as you suggest, and then add a comment to highlight the subtlety.
-- If "requiresNetworkMagic" is not specified, default to NMMustBeJust
ccrnm <- obj .:? "requiresNetworkMagic" .!= NMMustBeJust
- Rename to `canonicalJsonTestWithGen`. - Use Aeson optional-with-default combinator.
mhuesch
force-pushed
the
intricate+mhuesch/CO-354/core-config-rnm
branch
from
f4ca784 to
baf55d4
Compare
rvl
previously approved these changes
Sep 25, 2018
rvl
reviewed
Sep 25, 2018
disassembler
previously approved these changes
Sep 25, 2018
We want to be sure that mainnet/staging both have `NMMustBeNothing` as the `requiresNetworkMagic` field of their `ProtocolMagic` value, which is read from config. We add a simple test which can be run on the `lib/configuration.yaml` file and check multiple YAML keys for valid `RequiresNetworkMagic`s.
rvl
approved these changes
Sep 25, 2018
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
Linked issue
https://iohk.myjetbrains.com/youtrack/issue/CO-354
Type of change
Developer checklist
Testing checklist