Return hashrate of 0 when not mining.

PegaSysEng · Jul 11, 2019 · 8536f9a · 8536f9a
1 parent 1b68539
commit 8536f9a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/...pc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthHashrate.java b/...pc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthHashrate.java
@@ -40,10 +40,9 @@ public String getName() {
   public JsonRpcResponse response(final JsonRpcRequest req) {
     try {
       final Optional<Long> hashesPerSecond = miningCoordinator.hashesPerSecond();
-      if (hashesPerSecond.isPresent()) {
-        return new JsonRpcSuccessResponse(req.getId(), Quantity.create(hashesPerSecond.get()));
-      }
-      return new JsonRpcErrorResponse(req.getId(), JsonRpcError.NO_HASHES_PER_SECOND);
+      return hashesPerSecond
+          .map(hashes -> new JsonRpcSuccessResponse(req.getId(), Quantity.create(hashes)))
+          .orElseGet(() -> new JsonRpcSuccessResponse(req.getId(), Quantity.create(0)));
     } catch (final UnsupportedOperationException ex) {
       return new JsonRpcErrorResponse(req.getId(), JsonRpcError.INVALID_REQUEST);
     }

diff --git a/...rc/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthHashrateTest.java b/...rc/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthHashrateTest.java
@@ -59,10 +59,10 @@ public void shouldReturnValueFromMiningCoordinator() {
   }
 
   @Test
-  public void shouldReturnErrorWhenMiningCoordinatorDoesNotHaveHashes() {
+  public void shouldReturnZeroWhenMiningCoordinatorDoesNotHaveHashes() {
     final JsonRpcRequest request = requestWithParams();
     final JsonRpcResponse expectedResponse =
-        new JsonRpcErrorResponse(request.getId(), JsonRpcError.NO_HASHES_PER_SECOND);
+        new JsonRpcSuccessResponse(request.getId(), "0x0");
     when(miningCoordinator.hashesPerSecond()).thenReturn(Optional.empty());
 
     final JsonRpcResponse actualResponse = method.response(request);

diff --git a/ethereum/referencetests/src/test/resources b/ethereum/referencetests/src/test/resources