Skip to content

Commit b04f116

Browse files
authored
Merge pull request #2009 from thinkAfCod/fix_field_name
fix versionedHashes to blobVersionedHashes
2 parents b54cfa4 + ac4a117 commit b04f116

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

Diff for: core/src/main/java/org/web3j/protocol/core/methods/response/EthBlock.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ public TransactionObject(
836836
String maxPriorityFeePerGas,
837837
List<AccessListObject> accessList,
838838
String maxFeePerBlobGas,
839-
List<String> versionedHashes) {
839+
List<String> blobVersionedHashes) {
840840
super(
841841
hash,
842842
nonce,
@@ -862,7 +862,7 @@ public TransactionObject(
862862
maxPriorityFeePerGas,
863863
accessList,
864864
maxFeePerBlobGas,
865-
versionedHashes);
865+
blobVersionedHashes);
866866
}
867867

868868
@Override

Diff for: core/src/main/java/org/web3j/protocol/core/methods/response/Transaction.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class Transaction {
4444
private String maxPriorityFeePerGas;
4545
private List<AccessListObject> accessList;
4646
private String maxFeePerBlobGas;
47-
private List<String> versionedHashes;
47+
private List<String> blobVersionedHashes;
4848

4949
public Transaction() {}
5050

@@ -194,7 +194,7 @@ public Transaction(
194194
this.maxPriorityFeePerGas = maxPriorityFeePerGas;
195195
this.accessList = accessList;
196196
this.maxFeePerBlobGas = maxFeePerBlobGas;
197-
this.versionedHashes = versionedHashes;
197+
this.blobVersionedHashes = versionedHashes;
198198
}
199199

200200
public void setChainId(String chainId) {
@@ -449,12 +449,12 @@ public void setMaxFeePerBlobGas(String maxFeePerBlobGas) {
449449
this.maxFeePerBlobGas = maxFeePerBlobGas;
450450
}
451451

452-
public List<String> getVersionedHashes() {
453-
return versionedHashes;
452+
public List<String> getBlobVersionedHashes() {
453+
return blobVersionedHashes;
454454
}
455455

456-
public void setVersionedHashes(List<String> versionedHashes) {
457-
this.versionedHashes = versionedHashes;
456+
public void setBlobVersionedHashes(List<String> blobVersionedHashes) {
457+
this.blobVersionedHashes = blobVersionedHashes;
458458
}
459459

460460
@Override
@@ -565,9 +565,9 @@ public boolean equals(Object o) {
565565
: that.getMaxFeePerBlobGasRaw() != null) {
566566
return false;
567567
}
568-
if (getVersionedHashes() != null
569-
? !getVersionedHashes().equals(that.getVersionedHashes())
570-
: that.getVersionedHashes() != null) {
568+
if (getBlobVersionedHashes() != null
569+
? !getBlobVersionedHashes().equals(that.getBlobVersionedHashes())
570+
: that.getBlobVersionedHashes() != null) {
571571
return false;
572572
}
573573
if (getAccessList() != null
@@ -615,7 +615,7 @@ public int hashCode() {
615615
+ (getMaxFeePerBlobGasRaw() != null
616616
? getMaxFeePerBlobGasRaw().hashCode()
617617
: 0);
618-
result = 31 * result + (getVersionedHashes() != null ? getVersionedHashes().hashCode() : 0);
618+
result = 31 * result + (getBlobVersionedHashes() != null ? getBlobVersionedHashes().hashCode() : 0);
619619
result = 31 * result + (getAccessList() != null ? getAccessList().hashCode() : 0);
620620
return result;
621621
}

Diff for: core/src/test/java/org/web3j/protocol/core/ResponseTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -919,7 +919,7 @@ public void testEthBlockFullTransactionsWithBlob() {
919919
+ " \"maxFeePerGas\": \"0x7f110\",\n"
920920
+ " \"maxPriorityFeePerGas\": \"0x7f110\",\n"
921921
+ " \"maxFeePerBlobGas\": \"0x7f110\",\n"
922-
+ " \"versionedHashes\": [\"0x013343644e9aaa7e8673ba3be38b56bb3dfaa57db923797247e5f2e504b721c3\", \"0x01cad19a7fe88d9e14575394847a4a0026fccf292c4ca30ef047e6d03d3a74bb\"]"
922+
+ " \"blobVersionedHashes\": [\"0x013343644e9aaa7e8673ba3be38b56bb3dfaa57db923797247e5f2e504b721c3\", \"0x01cad19a7fe88d9e14575394847a4a0026fccf292c4ca30ef047e6d03d3a74bb\"]"
923923
+ " }], \n"
924924
+ " \"uncles\": [\n"
925925
+ " \"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347\",\n"

0 commit comments

Comments
 (0)