5098: Update already merged RpcErrorTypes to include index in excepti…

…on message (#7420) Signed-off-by: Matilda Clerke <[email protected]>
hyperledger · Aug 2, 2024 · 4199952 · 4199952
1 parent a6a0271
commit 4199952
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/...in/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugAccountRange.java b/...in/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugAccountRange.java
@@ -65,7 +65,7 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
       addressHash = requestContext.getRequiredParameter(2, String.class);
     } catch (Exception e) { // TODO:replace with JsonRpcParameter.JsonRpcParameterException
       throw new InvalidJsonRpcParameters(
-          "Invalid address hash parameter", RpcErrorType.INVALID_ADDRESS_HASH_PARAMS, e);
+          "Invalid address hash parameter (index 2)", RpcErrorType.INVALID_ADDRESS_HASH_PARAMS, e);
     }
     final int maxResults = requestContext.getRequiredParameter(3, Integer.TYPE);
 

diff --git a/.../besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToAllowlist.java b/.../besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToAllowlist.java
@@ -50,7 +50,7 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
       accountsList = requestContext.getRequiredParameter(0, List.class);
     } catch (Exception e) { // TODO:replace with JsonRpcParameter.JsonRpcParameterException
       throw new InvalidJsonRpcParameters(
-          "Invalid accounts list parameter", RpcErrorType.INVALID_ACCOUNT_PARAMS, e);
+          "Invalid accounts list parameter (index 0)", RpcErrorType.INVALID_ACCOUNT_PARAMS, e);
     }
 
     if (allowlistController.isPresent()) {

diff --git a/.../ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromAllowlist.java b/.../ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromAllowlist.java
@@ -50,7 +50,7 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
       accountsList = requestContext.getRequiredParameter(0, List.class);
     } catch (Exception e) { // TODO:replace with JsonRpcParameter.JsonRpcParameterException
       throw new InvalidJsonRpcParameters(
-          "Invalid accounts list parameter", RpcErrorType.INVALID_ACCOUNT_PARAMS, e);
+          "Invalid accounts list parameter (index 0)", RpcErrorType.INVALID_ACCOUNT_PARAMS, e);
     }
 
     if (allowlistController.isPresent()) {

diff --git a/...u/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToAllowlistTest.java b/...u/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToAllowlistTest.java
@@ -125,7 +125,7 @@ public void whenEmptyParamOnRequestShouldThrowInvalidJsonRpcException() {
     final Throwable thrown = catchThrowable(() -> method.response(request));
     assertThat(thrown)
         .isInstanceOf(InvalidJsonRpcParameters.class)
-        .hasMessage("Invalid accounts list parameter");
+        .hasMessage("Invalid accounts list parameter (index 0)");
   }
 
   private JsonRpcRequestContext request(final List<String> accounts) {

diff --git a/...ereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromAllowlistTest.java b/...ereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromAllowlistTest.java
@@ -126,7 +126,7 @@ public void whenEmptyParamOnRequestShouldThrowInvalidJsonRpcException() {
     final Throwable thrown = catchThrowable(() -> method.response(request));
     assertThat(thrown)
         .isInstanceOf(InvalidJsonRpcParameters.class)
-        .hasMessage("Invalid accounts list parameter");
+        .hasMessage("Invalid accounts list parameter (index 0)");
   }
 
   private JsonRpcRequestContext request(final List<String> accounts) {