fix: Update builder to withGas to match the json eth_call

Signed-off-by: Usman Saleem <[email protected]>
hyperledger · Jul 16, 2024 · 868eb9f · 868eb9f
1 parent 343ec7c
commit 868eb9f
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 19 deletions.
diff --git a/...g/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCallIntegrationTest.java b/...g/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCallIntegrationTest.java
@@ -126,7 +126,7 @@ public void shouldReturnErrorWithGasLimitTooLow() {
         new JsonCallParameter.JsonCallParameterBuilder()
             .withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
             .withTo(Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"))
-            .withGasLimit(0L)
+            .withGas(0L)
             .withInput(Bytes.fromHexString("0x12a7b914"))
             .build();
 

diff --git a/...r/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCreateAccessListIntegrationTest.java b/...r/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCreateAccessListIntegrationTest.java
@@ -197,7 +197,7 @@ public void shouldIgnoreSenderBalanceAccountWhenStrictModeDisabledAndReturnExpec
     final JsonCallParameter callParameter =
         new JsonCallParameter.JsonCallParameterBuilder()
             .withFrom(Address.fromHexString("0x0000000000000000000000000000000000000000"))
-            .withGasLimit(1L)
+            .withGas(1L)
             .withGasPrice(Wei.fromHexString("0x9999999999"))
             .withInput(
                 Bytes.fromHexString(
@@ -217,7 +217,7 @@ public void shouldIgnoreSenderBalanceAccountWhenStrictModeDisabledAndReturnExpec
   @Test
   public void shouldReturnExpectedValueForInsufficientGas() {
     final JsonCallParameter callParameter =
-        new JsonCallParameter.JsonCallParameterBuilder().withGasLimit(1L).build();
+        new JsonCallParameter.JsonCallParameterBuilder().withGas(1L).build();
     final JsonRpcRequestContext request = requestWithParams(callParameter);
     final JsonRpcResponse expectedResponse =
         new JsonRpcSuccessResponse(null, new CreateAccessListResult(new ArrayList<>(), 0xcf08));

diff --git a/...ledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthEstimateGasIntegrationTest.java b/...ledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthEstimateGasIntegrationTest.java
@@ -115,7 +115,7 @@ public void shouldIgnoreSenderBalanceAccountWhenStrictModeDisabledAndReturnExpec
     final JsonCallParameter callParameter =
         new JsonCallParameter.JsonCallParameterBuilder()
             .withFrom(Address.fromHexString("0x0000000000000000000000000000000000000000"))
-            .withGasLimit(1L)
+            .withGas(1L)
             .withGasPrice(Wei.fromHexString("0x9999999999"))
             .withInput(
                 Bytes.fromHexString(
@@ -136,7 +136,7 @@ public void shouldNotIgnoreSenderBalanceAccountWhenStrictModeDisabledAndThrowErr
     final JsonCallParameter callParameter =
         new JsonCallParameter.JsonCallParameterBuilder()
             .withFrom(Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"))
-            .withGasLimit(1L)
+            .withGas(1L)
             .withGasPrice(Wei.fromHexString("0x9999999999"))
             .withInput(
                 Bytes.fromHexString(
@@ -159,7 +159,7 @@ public void shouldNotIgnoreSenderBalanceAccountWhenStrictModeDisabledAndThrowErr
   @Test
   public void shouldReturnExpectedValueForInsufficientGas() {
     final JsonCallParameter callParameter =
-        new JsonCallParameter.JsonCallParameterBuilder().withGasLimit(1L).build();
+        new JsonCallParameter.JsonCallParameterBuilder().withGas(1L).build();
     final JsonRpcRequestContext request = requestWithParams(callParameter);
     final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x5208");
 

diff --git a/...java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java b/...java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java
@@ -27,7 +27,6 @@
 
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.apache.tuweni.bytes.Bytes;
 import org.slf4j.Logger;
@@ -118,7 +117,7 @@ public static final class JsonCallParameterBuilder {
     private Optional<Boolean> strict = Optional.empty();
     private Address from;
     private Address to;
-    private long gasLimit = -1;
+    private long gas = -1;
     private Optional<Wei> maxPriorityFeePerGas = Optional.empty();
     private Optional<Wei> maxFeePerGas = Optional.empty();
     private Optional<Wei> maxFeePerBlobGas = Optional.empty();
@@ -176,14 +175,13 @@ public JsonCallParameterBuilder withTo(final Address to) {
      * limit, the call is reverted. By default, if not specified, the gas limit is set to -1,
      * indicating that it is not set.
      *
-     * @param gasLimit the gas limit for the call, can be {@code null} to indicate that the gas
-     *     limit is not set
+     * @param gas the gas limit for the call, can be {@code null} to indicate that the gas limit is
+     *     not set
      * @return the {@link JsonCallParameterBuilder} instance for chaining
      */
     @JsonDeserialize(using = GasDeserializer.class)
-    @JsonProperty("gas")
-    public JsonCallParameterBuilder withGasLimit(final Long gasLimit) {
-      this.gasLimit = Optional.ofNullable(gasLimit).orElse(-1L);
+    public JsonCallParameterBuilder withGas(final Long gas) {
+      this.gas = Optional.ofNullable(gas).orElse(-1L);
       return this;
     }
 
@@ -351,7 +349,7 @@ public JsonCallParameter build() {
       return new JsonCallParameter(
           from,
           to,
-          gasLimit,
+          gas,
           gasPrice,
           maxPriorityFeePerGas,
           maxFeePerGas,

diff --git a/...src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCallTest.java b/...src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCallTest.java
@@ -446,7 +446,7 @@ private JsonCallParameter callParameter(
     return new JsonCallParameter.JsonCallParameterBuilder()
         .withFrom(Address.fromHexString("0x0"))
         .withTo(Address.fromHexString("0x0"))
-        .withGasLimit(0L)
+        .withGas(0L)
         .withGasPrice(gasPrice)
         .withMaxFeePerGas(maxFeesPerGas)
         .withMaxPriorityFeePerGas(maxPriorityFeesPerGas)

diff --git a/...a/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCreateAccessListTest.java b/...a/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCreateAccessListTest.java
@@ -308,7 +308,7 @@ private JsonCallParameter legacyTransactionCallParameter(final Wei gasPrice) {
     return new JsonCallParameter.JsonCallParameterBuilder()
         .withFrom(Address.fromHexString("0x0"))
         .withTo(Address.fromHexString("0x0"))
-        .withGasLimit(0L)
+        .withGas(0L)
         .withGasPrice(gasPrice)
         .withValue(Wei.ZERO)
         .withInput(Bytes.EMPTY)

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
@@ -468,7 +468,7 @@ private JsonCallParameter legacyTransactionCallParameter(
     return new JsonCallParameter.JsonCallParameterBuilder()
         .withFrom(Address.fromHexString("0x0"))
         .withTo(Address.fromHexString("0x0"))
-        .withGasLimit(0L)
+        .withGas(0L)
         .withGasPrice(gasPrice)
         .withValue(Wei.ZERO)
         .withInput(Bytes.EMPTY)

diff --git a/.../org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonCallParameterTest.java b/.../org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonCallParameterTest.java
@@ -101,6 +101,7 @@ public void inputAndDataWithDifferentValueAsPayLoadCauseException() {
 
   @Test
   public void extraParametersAreIgnoredIgnored() throws JsonProcessingException {
+    //0x96 = 150
     final String json =
         """
             {

diff --git a/...org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCallTest.java b/...org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCallTest.java
@@ -77,7 +77,7 @@ public void shouldThrowInvalidJsonRpcParametersExceptionWhenMissingToField() {
     final JsonCallParameter callParameter =
         new JsonCallParameter.JsonCallParameterBuilder()
             .withFrom(Address.fromHexString("0x0"))
-            .withGasLimit(0L)
+            .withGas(0L)
             .withGasPrice(Wei.ZERO)
             .withValue(Wei.ZERO)
             .withInput(Bytes.EMPTY)
@@ -181,7 +181,7 @@ private JsonCallParameter callParameter() {
     return new JsonCallParameter.JsonCallParameterBuilder()
         .withFrom(Address.fromHexString("0x0"))
         .withTo(Address.fromHexString("0x0"))
-        .withGasLimit(0L)
+        .withGas(0L)
         .withGasPrice(Wei.ZERO)
         .withValue(Wei.ZERO)
         .withInput(Bytes.EMPTY)
-Original file line number
+Diff line change
@@ Expand Up @@
       @Test
       public void extraParametersAreIgnoredIgnored() throws JsonProcessingException {
+        //0x96 = 150
         final String json =
             """
                 {
@@ Expand Down @@