Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

Report 0 hashrate when the mining coordinator doesn't support mining #1757

Merged
merged 2 commits into from
Jul 25, 2019
Merged

Report 0 hashrate when the mining coordinator doesn't support mining #1757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a1e75b
Report 0 hashrate when the mining coordinator doesn't support mining …
ajsutton Jul 24, 2019
72be750
Merge branch 'release-1.2' into backport-hashrate-fix
ajsutton Jul 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...reation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/MiningCoordinator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ default Optional<Address> getCoinbase() {
}

default Optional<Long> hashesPerSecond() {
throw new UnsupportedOperationException(
"Current consensus mechanism prevents querying of hashrate.");
return Optional.empty();
}

default Optional<EthHashSolverInputs> getWorkDefinition() {
Expand Down
10 changes: 2 additions & 8 deletions ...pc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthHashrate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator;
import tech.pegasys.pantheon.ethereum.jsonrpc.RpcMethod;
import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest;
import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError;
import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse;
import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse;
import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse;
import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.Quantity;
Expand All @@ -38,11 +36,7 @@ public String getName() {

@Override
public JsonRpcResponse response(final JsonRpcRequest req) {
try {
final Optional<Long> hashesPerSecond = miningCoordinator.hashesPerSecond();
return new JsonRpcSuccessResponse(req.getId(), Quantity.create(hashesPerSecond.orElse(0L)));
} catch (final UnsupportedOperationException ex) {
return new JsonRpcErrorResponse(req.getId(), JsonRpcError.INVALID_REQUEST);
}
final Optional<Long> hashesPerSecond = miningCoordinator.hashesPerSecond();
return new JsonRpcSuccessResponse(req.getId(), Quantity.create(hashesPerSecond.orElse(0L)));
}
}
13 changes: 0 additions & 13 deletions ...rc/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthHashrateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator;
import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest;
import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError;
import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse;
import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse;
import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse;

Expand Down Expand Up @@ -68,17 +66,6 @@ public void shouldReturnZeroWhenMiningCoordinatorDoesNotHaveHashes() {
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
}

@Test
public void shouldReturnErrorWhenMiningCoordinatorDoesNotSupportHashing() {
final JsonRpcRequest request = requestWithParams();
final JsonRpcResponse expectedResponse =
new JsonRpcErrorResponse(request.getId(), JsonRpcError.INVALID_REQUEST);
when(miningCoordinator.hashesPerSecond()).thenThrow(UnsupportedOperationException.class);

final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
}

private JsonRpcRequest requestWithParams() {
return new JsonRpcRequest(JSON_RPC_VERSION, ETH_METHOD, new Object[] {});
}
Expand Down