5098 branch 23 rename is complete transaction (#7479)

* 5098: Add RpcErrorTypes
Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net>

---------

Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net>
Signed-off-by: Matilda-Clerke <matilda.clerke@consensys.net>
Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com>

ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetBlockByNumberIntegrationTest.java

@@ -437,7 +437,7 @@ public class EthGetBlockByNumberIntegrationTest {
 
     assertThat(thrown)
         .isInstanceOf(InvalidJsonRpcParameters.class)
-        .hasMessage("Invalid is transaction complete parameter (index 1)");
+        .hasMessage("Invalid return complete transaction parameter (index 1)");
   }
 
   /**

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/execution/TracedJsonRpcProcessor.java

@@ -84,7 +84,7 @@ public class TracedJsonRpcProcessor implements JsonRpcProcessor {
         case INVALID_GAS_PRICE_PARAMS:
         case INVALID_HASH_RATE_PARAMS:
         case INVALID_ID_PARAMS:
-        case INVALID_IS_TRANSACTION_COMPLETE_PARAMS:
+        case INVALID_RETURN_COMPLETE_TRANSACTION_PARAMS:
         case INVALID_LOG_FILTER_PARAMS:
         case INVALID_LOG_LEVEL_PARAMS:
         case INVALID_MAX_RESULTS_PARAMS:

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByHash.java

@@ -68,7 +68,7 @@ public class DebugTraceBlockByHash implements JsonRpcMethod {
               .orElse(TraceOptions.DEFAULT);
     } catch (Exception e) { // TODO:replace with JsonRpcParameter.JsonRpcParameterException
       throw new InvalidJsonRpcParameters(
-          "Invalid transaction trace parameters (index 1)",
+          "Invalid transaction trace parameter (index 1)",
           RpcErrorType.INVALID_TRANSACTION_TRACE_PARAMS,
           e);
     }

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceCall.java

@@ -62,7 +62,7 @@ public class DebugTraceCall extends AbstractTraceCall {
           .orElse(TraceOptions.DEFAULT);
     } catch (Exception e) { // TODO:replace with JsonRpcParameter.JsonRpcParameterException
       throw new InvalidJsonRpcParameters(
-          "Invalid transaction trace parameters (index 2)",
+          "Invalid transaction trace parameter (index 2)",
           RpcErrorType.INVALID_TRANSACTION_TRACE_PARAMS,
           e);
     }

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHash.java

@@ -97,8 +97,8 @@ public class EthGetBlockByHash implements JsonRpcMethod {
       return requestContext.getRequiredParameter(1, Boolean.class);
     } catch (Exception e) { // TODO:replace with JsonRpcParameter.JsonRpcParameterException
       throw new InvalidJsonRpcParameters(
-          "Invalid is complete transaction parameter (index 1)",
+          "Invalid return complete transaction parameter (index 1)",
-          RpcErrorType.INVALID_IS_TRANSACTION_COMPLETE_PARAMS,
+          RpcErrorType.INVALID_RETURN_COMPLETE_TRANSACTION_PARAMS,
           e);
     }
   }

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByNumber.java

@@ -128,8 +128,8 @@ public class EthGetBlockByNumber extends AbstractBlockParameterMethod {
       return request.getRequiredParameter(1, Boolean.class);
     } catch (Exception e) { // TODO:replace with JsonRpcParameter.JsonRpcParameterException
       throw new InvalidJsonRpcParameters(
-          "Invalid is transaction complete parameter (index 1)",
+          "Invalid return complete transaction parameter (index 1)",
-          RpcErrorType.INVALID_IS_TRANSACTION_COMPLETE_PARAMS,
+          RpcErrorType.INVALID_RETURN_COMPLETE_TRANSACTION_PARAMS,
           e);
     }
   }

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceGet.java

@@ -60,7 +60,7 @@ public class TraceGet extends AbstractTraceByHash implements JsonRpcMethod {
       transactionHash = requestContext.getRequiredParameter(0, Hash.class);
     } catch (Exception e) { // TODO:replace with JsonRpcParameter.JsonRpcParameterException
       throw new InvalidJsonRpcParameters(
-          "Invalid transaction has parameter (index 0)",
+          "Invalid transaction hash parameter (index 0)",
           RpcErrorType.INVALID_TRANSACTION_HASH_PARAMS,
           e);
     }

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/RpcErrorType.java

@@ -66,8 +66,8 @@ public enum RpcErrorType implements RpcMethodError {
   INVALID_GAS_PRICE_PARAMS(INVALID_PARAMS_ERROR_CODE, "Invalid gas price params"),
   INVALID_HASH_RATE_PARAMS(INVALID_PARAMS_ERROR_CODE, "Invalid hash rate params"),
   INVALID_ID_PARAMS(INVALID_PARAMS_ERROR_CODE, "Invalid ID params"),
-  INVALID_IS_TRANSACTION_COMPLETE_PARAMS(
+  INVALID_RETURN_COMPLETE_TRANSACTION_PARAMS(
-      INVALID_PARAMS_ERROR_CODE, "Invalid is transaction complete params"),
+      INVALID_PARAMS_ERROR_CODE, "Invalid return complete transaction params"),
   INVALID_LOG_FILTER_PARAMS(INVALID_PARAMS_ERROR_CODE, "Invalid log filter params"),
   INVALID_LOG_LEVEL_PARAMS(
       INVALID_PARAMS_ERROR_CODE, "Invalid log level params (missing or incorrect)"),

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTest.java

@@ -784,7 +784,7 @@ public class JsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
       assertThat(resp.code()).isEqualTo(200);
       // Check general format of result
       final JsonObject json = new JsonObject(resp.body().string());
-      final RpcErrorType expectedError = RpcErrorType.INVALID_IS_TRANSACTION_COMPLETE_PARAMS;
+      final RpcErrorType expectedError = RpcErrorType.INVALID_RETURN_COMPLETE_TRANSACTION_PARAMS;
       testHelper.assertValidJsonRpcError(
           json, id, expectedError.getCode(), expectedError.getMessage());
     }
@@ -854,7 +854,7 @@ public class JsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
       assertThat(resp.code()).isEqualTo(200);
       // Check general format of result
       final JsonObject json = new JsonObject(resp.body().string());
-      final RpcErrorType expectedError = RpcErrorType.INVALID_IS_TRANSACTION_COMPLETE_PARAMS;
+      final RpcErrorType expectedError = RpcErrorType.INVALID_RETURN_COMPLETE_TRANSACTION_PARAMS;
       testHelper.assertValidJsonRpcError(
           json, id, expectedError.getCode(), expectedError.getMessage());
     }

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHashTest.java

@@ -69,7 +69,7 @@ public class EthGetBlockByHashTest {
   public void exceptionWhenNoBoolSupplied() {
     assertThatThrownBy(() -> method.response(requestWithParams(ZERO_HASH)))
         .isInstanceOf(InvalidJsonRpcParameters.class)
-        .hasMessage("Invalid is complete transaction parameter (index 1)");
+        .hasMessage("Invalid return complete transaction parameter (index 1)");
     verifyNoMoreInteractions(blockchainQueries);
   }
 
@@ -85,7 +85,7 @@ public class EthGetBlockByHashTest {
   public void exceptionWhenBoolParamInvalid() {
     assertThatThrownBy(() -> method.response(requestWithParams(ZERO_HASH, "maybe")))
         .isInstanceOf(InvalidJsonRpcParameters.class)
-        .hasMessage("Invalid is complete transaction parameter (index 1)");
+        .hasMessage("Invalid return complete transaction parameter (index 1)");
     verifyNoMoreInteractions(blockchainQueries);
   }
 

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByNumberTest.java

@@ -121,7 +121,7 @@ public class EthGetBlockByNumberTest {
   public void exceptionWhenNoBoolSupplied() {
     assertThatThrownBy(() -> method.response(requestWithParams("0")))
         .isInstanceOf(InvalidJsonRpcParameters.class)
-        .hasMessage("Invalid is transaction complete parameter (index 1)");
+        .hasMessage("Invalid return complete transaction parameter (index 1)");
     verifyNoMoreInteractions(blockchainQueries);
   }
 
@@ -137,7 +137,7 @@ public class EthGetBlockByNumberTest {
   public void exceptionWhenBoolParamInvalid() {
     assertThatThrownBy(() -> method.response(requestWithParams("0", "maybe")))
         .isInstanceOf(InvalidJsonRpcParameters.class)
-        .hasMessage("Invalid is transaction complete parameter (index 1)");
+        .hasMessage("Invalid return complete transaction parameter (index 1)");
     verifyNoMoreInteractions(blockchainQueries);
   }