This repository has been archived by the owner on Sep 26, 2019. It is now read-only.
Nodes whitelist JSON-RPC APIs #476
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
lucassaldanha
suggested changes
Dec 20, 2018
...tance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/AcceptanceTestBase.java
Outdated
Show resolved
Hide resolved
...c/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/factory/PantheonNodeFactory.java
Show resolved
Hide resolved
...ests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/PantheonWeb3j.java
Outdated
Show resolved
Hide resolved
...test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/perm/PermAddNodeAcceptanceTest.java
Outdated
Show resolved
Hide resolved
...c/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/eea/PermAddNode.java
Outdated
Show resolved
Hide resolved
...c/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/eea/PermAddNode.java
Outdated
Show resolved
Hide resolved
...rc/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/eea/PermRemoveNode.java
Outdated
Show resolved
Hide resolved
macfarla
reviewed
Dec 20, 2018
...c/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/eea/PermAddNode.java
Outdated
Show resolved
Hide resolved
...rc/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/eea/PermRemoveNode.java
Outdated
Show resolved
Hide resolved
...c/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/eea/PermAddNodeTest.java
Outdated
Show resolved
Hide resolved
...est/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/eea/PermRemoveNodeTest.java
Outdated
Show resolved
Hide resolved
lucassaldanha
approved these changes
Dec 21, 2018
lucassaldanha
suggested changes
Dec 21, 2018
| return new JsonRpcSuccessResponse(req.getId(), true); | ||
| } catch (IllegalArgumentException e) { | ||
| return new JsonRpcErrorResponse(req.getId(), JsonRpcError.NODE_WHITELIST_INVALID_ENTRY); | ||
| } catch (Exception e) { |
There was a problem hiding this comment.
I think capturing a generic exception and assuming it was caused by a missing entry can be misleading. If it is a server failure or something else throwing the exception we will never know the true cause.
It would be good to either create specific exceptions (what we don't do much in Pantheon) or create an object that represents the status of the removeNodes operation. And based on the status you choose the correct error response. This is the approach I took for the Accounts whitelist.
There was a problem hiding this comment.
Good idea. I'll implement a return object to make this a bit clearer and enable the generic handler to catch unexpected exceptions. 👍
| return new JsonRpcSuccessResponse(req.getId(), true); | ||
| } catch (IllegalArgumentException e) { | ||
| return new JsonRpcErrorResponse(req.getId(), JsonRpcError.NODE_WHITELIST_INVALID_ENTRY); | ||
| } catch (Exception e) { |
There was a problem hiding this comment.
Same comment about the generic exception catch here.
lucassaldanha
previously requested changes
Dec 23, 2018
...va/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/GetNodesWhitelistPopulated.java
Outdated
Show resolved
Hide resolved
…r -> enode conversion.
Errorific
reviewed
Jan 9, 2019
| } | ||
| } | ||
|
|
||
| private String buildEnodeURI(final Peer s) { |
There was a problem hiding this comment.
would this be better moved into Peer? e.g. peer.getEnodeURI()
Errorific
approved these changes
Jan 9, 2019
mark-terry
dismissed
lucassaldanha’s stale review
Concerns addressed in subsequent commit.
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
Added JSON-RPC methods to interact with the permissioning whitelist.
Fixed Issue(s)
#NC-1938