Merge branch 'main' into 5098-branch-9-update-invalid-block-count-params

Signed-off-by: Matilda-Clerke <[email protected]>
hyperledger · Aug 12, 2024 · 7c14379 · 7c14379
2 parents 9758f31 + bca34cb
commit 7c14379
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/...c/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthFeeHistory.java b/...c/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthFeeHistory.java
@@ -105,6 +105,7 @@ public JsonRpcResponse response(final JsonRpcRequestContext request) {
       throw new InvalidJsonRpcParameters(
           "Invalid highest block parameter (index 1)", RpcErrorType.INVALID_BLOCK_PARAMS, e);
     }
+
     final Optional<List<Double>> maybeRewardPercentiles =
         request.getOptionalParameter(2, Double[].class).map(Arrays::asList);
 

diff --git a/...erledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetMinerDataByBlockNumberTest.java b/...erledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetMinerDataByBlockNumberTest.java
@@ -103,7 +103,7 @@ public void exceptionWhenNoNumberSuppliedTest() {
     JsonRpcRequestContext requestContext = new JsonRpcRequestContext(request);
     assertThatThrownBy(() -> method.response(requestContext))
         .isInstanceOf(InvalidJsonRpcParameters.class)
-        .hasMessage("Invalid block parameter");
+        .hasMessage("Invalid block parameter (index 0)");
 
     verifyNoMoreInteractions(blockchainQueries);
   }

diff --git a/...dger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndexTest.java b/...dger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndexTest.java
@@ -79,7 +79,7 @@ public void shouldReturnErrorWhenMissingBlockNumberParam() {
 
     assertThat(thrown)
         .isInstanceOf(InvalidJsonRpcParameters.class)
-        .hasMessage("Invalid block parameter");
+        .hasMessage("Invalid block parameter (index 0)");
   }
 
   @Test

diff --git a/.../specs/replay-trace-transaction/flat/trace_replayBlockTransactions_invalidBlockParam.json b/.../specs/replay-trace-transaction/flat/trace_replayBlockTransactions_invalidBlockParam.json
@@ -13,7 +13,7 @@
     "id": 415,
     "error": {
       "code": -32602,
-      "message": "Invalid params"
+      "message": "Invalid block, unable to parse RLP"
     }
   },
   "statusCode": 200