This repository has been archived by the owner on Sep 26, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 130
[PIE-1809] Clean up genesis parsing #1809
Merged
mbaxter
merged 11 commits into
PegaSysEng:master
from
mbaxter:PIE-1809/cleanup-genesis-parsing
Aug 1, 2019
Merged
[PIE-1809] Clean up genesis parsing #1809
mbaxter
merged 11 commits into
PegaSysEng:master
from
mbaxter:PIE-1809/cleanup-genesis-parsing
Aug 1, 2019
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
Allow comments in genesis files for now ...
shemnon
reviewed
Jul 31, 2019
config/src/main/java/tech/pegasys/pantheon/config/JsonUtil.java
Outdated
Show resolved
Hide resolved
shemnon
reviewed
Aug 1, 2019
"genesis.json", | ||
true, | ||
asList("key.pub", "priv.test")); | ||
@Test |
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.
Did this sneak in from another changelist?
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.
No, I made the validation stricter here, so added a test for that, and reworked this pre-existing test to use assertThatThrownBy
rather than the @Test(expected = ...)
annotation.
This subcommand was using vertx
libraries because it was interacting with JsonGenesisConfigOptions
.
shemnon
approved these changes
Aug 1, 2019
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.
PR description
Remove
vertx
dependency fromtech.pegasys.pantheon.config
package. Instead of usingvertx
's json parsing utilities, just use the underlyingjackson
parsing library.