Update unit tests

Signed-off-by: Matthew Whitehead <matthew1001@gmail.com>
hyperledger · Jan 4, 2024 · b4dbc9e · b4dbc9e
1 parent e04eed4
commit b4dbc9e
Showing 1 changed file with 39 additions and 11 deletions.
diff --git a/...t/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java b/...t/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java
@@ -209,10 +209,13 @@ public void shouldReturnErrorWhenLegacyTransactionProcessorReturnsTxInvalidReaso
     final JsonRpcRequestContext request =
         ethEstimateGasRequest(defaultLegacyTransactionCallParameter(Wei.ZERO));
     mockTransientProcessorResultTxInvalidReason(
-        TransactionInvalidReason.UPFRONT_COST_EXCEEDS_BALANCE);
+        TransactionInvalidReason.UPFRONT_COST_EXCEEDS_BALANCE,
+        "transaction up-front cost 10 exceeds transaction sender account balance 5");
 
-    final JsonRpcResponse expectedResponse =
-        new JsonRpcErrorResponse(null, RpcErrorType.TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE);
+    final RpcErrorType rpcErrorType = RpcErrorType.TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE;
+    final JsonRpcError rpcError = new JsonRpcError(rpcErrorType);
+    rpcError.setReason("transaction up-front cost 10 exceeds transaction sender account balance 5");
+    final JsonRpcResponse expectedResponse = new JsonRpcErrorResponse(null, rpcError);
 
     Assertions.assertThat(method.response(request))
         .usingRecursiveComparison()
@@ -223,10 +226,13 @@ public void shouldReturnErrorWhenLegacyTransactionProcessorReturnsTxInvalidReaso
   public void shouldReturnErrorWhenEip1559TransactionProcessorReturnsTxInvalidReason() {
     final JsonRpcRequestContext request = ethEstimateGasRequest(eip1559TransactionCallParameter());
     mockTransientProcessorResultTxInvalidReason(
-        TransactionInvalidReason.UPFRONT_COST_EXCEEDS_BALANCE);
+        TransactionInvalidReason.UPFRONT_COST_EXCEEDS_BALANCE,
+        "transaction up-front cost 10 exceeds transaction sender account balance 5");
 
-    final JsonRpcResponse expectedResponse =
-        new JsonRpcErrorResponse(null, RpcErrorType.TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE);
+    final RpcErrorType rpcErrorType = RpcErrorType.TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE;
+    final JsonRpcError rpcError = new JsonRpcError(rpcErrorType);
+    rpcError.setReason("transaction up-front cost 10 exceeds transaction sender account balance 5");
+    final JsonRpcResponse expectedResponse = new JsonRpcErrorResponse(null, rpcError);
 
     Assertions.assertThat(method.response(request))
         .usingRecursiveComparison()
@@ -243,9 +249,9 @@ public void shouldReturnErrorWhenWorldStateIsNotAvailable() {
     final JsonRpcResponse expectedResponse =
         new JsonRpcErrorResponse(null, RpcErrorType.WORLD_STATE_UNAVAILABLE);
 
-    Assertions.assertThat(method.response(request))
-        .usingRecursiveComparison()
-        .isEqualTo(expectedResponse);
+    JsonRpcResponse theResponse = method.response(request);
+
+    Assertions.assertThat(theResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -364,10 +370,32 @@ public void shouldNotIgnoreSenderBalanceAccountWhenStrictModeDisabled() {
             eq(1L));
   }
 
-  private void mockTransientProcessorResultTxInvalidReason(final TransactionInvalidReason reason) {
+  @Test
+  public void shouldIncludeHaltReasonWhenExecutionHalts() {
+    final JsonRpcRequestContext request =
+        ethEstimateGasRequest(defaultLegacyTransactionCallParameter(Wei.ZERO));
+    mockTransientProcessorResultTxInvalidReason(
+        TransactionInvalidReason.EXECUTION_HALTED, "INVALID_OPERATION");
+
+    final RpcErrorType rpcErrorType = RpcErrorType.EXECUTION_HALTED;
+    final JsonRpcError rpcError = new JsonRpcError(rpcErrorType);
+    rpcError.setReason("INVALID_OPERATION");
+    final JsonRpcResponse expectedResponse = new JsonRpcErrorResponse(null, rpcError);
+
+    Assertions.assertThat(method.response(request))
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
+  }
+
+  private void mockTransientProcessorResultTxInvalidReason(
+      final TransactionInvalidReason reason, final String validationFailedErrorMessage) {
     final TransactionSimulatorResult mockTxSimResult =
         getMockTransactionSimulatorResult(false, 0, Wei.ZERO, Optional.empty());
-    when(mockTxSimResult.getValidationResult()).thenReturn(ValidationResult.invalid(reason));
+    when(mockTxSimResult.getValidationResult())
+        .thenReturn(
+            validationFailedErrorMessage == null
+                ? ValidationResult.invalid(reason)
+                : ValidationResult.invalid(reason, validationFailedErrorMessage));
   }
 
   private void mockTransientProcessorTxReverted(