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
[minor] add rpc_modules json-rpc #1036
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
47 changes: 47 additions & 0 deletions
47
...rpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/RpcModules.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
/* | ||
* Copyright 2018 ConsenSys AG. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on | ||
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations under the License. | ||
*/ | ||
package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; | ||
|
||
import tech.pegasys.pantheon.ethereum.jsonrpc.RpcApi; | ||
import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; | ||
import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; | ||
import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; | ||
|
||
import java.util.Collection; | ||
import java.util.Map; | ||
import java.util.function.Function; | ||
import java.util.stream.Collectors; | ||
|
||
public class RpcModules implements JsonRpcMethod { | ||
|
||
private final Map<String, String> moduleVersions; | ||
|
||
public RpcModules(final Collection<RpcApi> modulesList) { | ||
this.moduleVersions = | ||
modulesList.stream() | ||
.map(RpcApi::getCliValue) | ||
.map(String::toLowerCase) | ||
.collect(Collectors.toMap(Function.identity(), s -> "1.0")); | ||
} | ||
|
||
@Override | ||
public String getName() { | ||
return "rpc_modules"; | ||
} | ||
|
||
@Override | ||
public JsonRpcResponse response(final JsonRpcRequest req) { | ||
// For now, just return an empty list. | ||
return new JsonRpcSuccessResponse(req.getId(), moduleVersions); | ||
} | ||
} |
55 changes: 55 additions & 0 deletions
55
...src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/RpcModulesTest.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
/* | ||
* Copyright 2018 ConsenSys AG. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on | ||
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations under the License. | ||
*/ | ||
package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; | ||
|
||
import static org.assertj.core.api.Assertions.assertThat; | ||
|
||
import tech.pegasys.pantheon.ethereum.jsonrpc.RpcApis; | ||
import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; | ||
import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; | ||
import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; | ||
|
||
import com.google.common.collect.ImmutableList; | ||
import com.google.common.collect.ImmutableMap; | ||
import org.junit.Before; | ||
import org.junit.Test; | ||
|
||
public class RpcModulesTest { | ||
|
||
private final String JSON_RPC_VERSION = "2.0"; | ||
private final String RPC_METHOD = "rpc_modules"; | ||
|
||
private RpcModules method; | ||
|
||
@Before | ||
public void setUp() { | ||
method = new RpcModules(ImmutableList.of(RpcApis.DEBUG)); | ||
} | ||
|
||
@Test | ||
public void shouldReturnCorrectMethodName() { | ||
assertThat(method.getName()).isEqualTo(RPC_METHOD); | ||
} | ||
|
||
@Test | ||
public void shouldReturnCorrectResult() { | ||
final JsonRpcRequest request = | ||
new JsonRpcRequest(JSON_RPC_VERSION, RPC_METHOD, new Object[] {}); | ||
|
||
final JsonRpcResponse expected = | ||
new JsonRpcSuccessResponse(request.getId(), ImmutableMap.of("debug", "1.0")); | ||
final JsonRpcResponse actual = method.response(request); | ||
|
||
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); | ||
} | ||
} |
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.
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.
Looks like you can cut this comment.
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.
Done