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
Nc 2107 permissioning config toml file #643
Merged
macfarla
merged 51 commits into
PegaSysEng:master
from
macfarla:nc-2107-permissioning-config-toml-file
Jan 29, 2019
Merged
Nc 2107 permissioning config toml file #643
macfarla
merged 51 commits into
PegaSysEng:master
from
macfarla:nc-2107-permissioning-config-toml-file
Jan 29, 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
…permissioning-config-toml-file
…permissioning-config-toml-file
…acfarla/pantheon into nc-2107-permissioning-config-toml-file
…permissioning-config-toml-file
…permissioning-config-toml-file
…permissioning-config-toml-file
…permissioning-config-toml-file
…permissioning-config-toml-file
…permissioning-config-toml-file
mark-terry
reviewed
Jan 29, 2019
pantheon/src/main/java/tech/pegasys/pantheon/util/PermissioningConfigurationValidator.java
Outdated
Show resolved
Hide resolved
if (permissioningConfigFile.exists()) { | ||
return permissioningConfigFile; | ||
} else { | ||
LOG.error("Unable to load permissioning config file from location {}.", filename); |
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.
Should this be more explicit that the file doesn't exist at the specified location? I feel like this could be interpreted as "something went wrong", not "it wasn't there."
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.
👍
pantheon/src/main/java/tech/pegasys/pantheon/TomlConfigFileParser.java
Outdated
Show resolved
Hide resolved
pantheon/src/main/java/tech/pegasys/pantheon/util/PermissioningConfigurationValidator.java
Outdated
Show resolved
Hide resolved
…permissioning-config-toml-file
…permissioning-config-toml-file
…acfarla/pantheon into nc-2107-permissioning-config-toml-file
mark-terry
approved these changes
Jan 29, 2019
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.
LGTM...
vinistevam
pushed a commit
to vinistevam/pantheon
that referenced
this pull request
Jan 29, 2019
* create permissioning config from toml file * added CLI options for separately enabling node and account permissioning * moved check for bootnodes on whitelist out of CLI
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
Parse TOML config file for permissions config options
Also added CLI options
--permissions-nodes-enabled
--permissions-accounts-enabled
Fixed Issue(s)
NC-2107