Fix get signerMetrics when there are fewer blocks in the network than…

… the default range (#1725)
PegaSysEng · Jul 21, 2019 · ad4b5d4 · ad4b5d4
1 parent b81c838
commit ad4b5d4
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 1 deletion.
diff --git a/...va/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignerMetricsTest.java b/...va/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignerMetricsTest.java
@@ -13,7 +13,10 @@
 package tech.pegasys.pantheon.consensus.clique.jsonrpc.methods;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.AdditionalMatchers.lt;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import tech.pegasys.pantheon.consensus.common.BlockInterface;
@@ -141,6 +144,30 @@ public void getSignerMetrics() {
         .containsExactlyInAnyOrderElementsOf(signerMetricResultList);
   }
 
+  @Test
+  @SuppressWarnings("unchecked")
+  public void getSignerMetricsWhenThereAreFewerBlocksThanTheDefaultRange() {
+    final long startBlock = 0L;
+    final long headBlock = 2L;
+
+    final List<SignerMetricResult> signerMetricResultList = new ArrayList<>();
+
+    when(blockchainQueries.headBlockNumber()).thenReturn(headBlock);
+
+    LongStream.range(startBlock, headBlock)
+        .forEach(value -> signerMetricResultList.add(generateBlock(value)));
+
+    final JsonRpcRequest request = requestWithParams();
+
+    final JsonRpcSuccessResponse response = (JsonRpcSuccessResponse) method.response(request);
+
+    // verify getBlockHeaderByNumber is not called with negative values
+    verify(blockchainQueries, never()).getBlockHeaderByNumber(lt(0L));
+
+    assertThat((Collection<SignerMetricResult>) response.getResult())
+        .containsExactlyInAnyOrderElementsOf(signerMetricResultList);
+  }
+
   @Test
   @SuppressWarnings("unchecked")
   public void getSignerMetricsWithLatest() {

diff --git a/...n/java/tech/pegasys/pantheon/consensus/common/jsonrpc/AbstractGetSignerMetricsMethod.java b/...n/java/tech/pegasys/pantheon/consensus/common/jsonrpc/AbstractGetSignerMetricsMethod.java
@@ -101,7 +101,7 @@ public JsonRpcResponse response(final JsonRpcRequest request) {
   private long getFromBlockNumber(final Optional<BlockParameter> startBlockParameter) {
     return startBlockParameter
         .map(this::resolveBlockNumber)
-        .orElseGet(() -> blockchainQueries.headBlockNumber() - DEFAULT_RANGE_BLOCK);
+        .orElseGet(() -> Math.max(0, blockchainQueries.headBlockNumber() - DEFAULT_RANGE_BLOCK));
   }
 
   private long getEndBlockNumber(final Optional<BlockParameter> endBlockParameter) {

diff --git a/...t/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetSignerMetricsTest.java b/...t/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetSignerMetricsTest.java
@@ -13,7 +13,10 @@
 package tech.pegasys.pantheon.consensus.ibft.jsonrpc.methods;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.AdditionalMatchers.lt;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import tech.pegasys.pantheon.consensus.common.BlockInterface;
@@ -141,6 +144,30 @@ public void getSignerMetrics() {
         .containsExactlyInAnyOrderElementsOf(signerMetricResultList);
   }
 
+  @Test
+  @SuppressWarnings("unchecked")
+  public void getSignerMetricsWhenThereAreFewerBlocksThanTheDefaultRange() {
+    final long startBlock = 0L;
+    final long headBlock = 2L;
+
+    final List<SignerMetricResult> signerMetricResultList = new ArrayList<>();
+
+    when(blockchainQueries.headBlockNumber()).thenReturn(headBlock);
+
+    LongStream.range(startBlock, headBlock)
+        .forEach(value -> signerMetricResultList.add(generateBlock(value)));
+
+    final JsonRpcRequest request = requestWithParams();
+
+    final JsonRpcSuccessResponse response = (JsonRpcSuccessResponse) method.response(request);
+
+    // verify getBlockHeaderByNumber is not called with negative values
+    verify(blockchainQueries, never()).getBlockHeaderByNumber(lt(0L));
+
+    assertThat((Collection<SignerMetricResult>) response.getResult())
+        .containsExactlyInAnyOrderElementsOf(signerMetricResultList);
+  }
+
   @Test
   @SuppressWarnings("unchecked")
   public void getSignerMetricsWithLatest() {