From b9898febba62d457095bb4676bc6b0e63c5ef701 Mon Sep 17 00:00:00 2001 From: tonykwok1992 Date: Wed, 13 Mar 2024 15:16:04 +0800 Subject: [PATCH] Fix test --- .../main/java/org/web3j/codegen/unit/gen/MethodFilter.java | 3 ++- .../web3j/codegen/SolidityFunctionWrapperGeneratorTest.java | 6 +++--- .../solidity/arraysinstruct/build/java/ArraysInStruct.java | 2 +- .../eventparameters/build/java/EventParameters.java | 2 +- .../onlyinarraystruct/build/java/OnlyInArrayStruct.java | 2 +- .../web3j/protocol/core/methods/response/Transaction.java | 6 +++++- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/codegen/src/main/java/org/web3j/codegen/unit/gen/MethodFilter.java b/codegen/src/main/java/org/web3j/codegen/unit/gen/MethodFilter.java index 82a71e5526..c527ac601e 100644 --- a/codegen/src/main/java/org/web3j/codegen/unit/gen/MethodFilter.java +++ b/codegen/src/main/java/org/web3j/codegen/unit/gen/MethodFilter.java @@ -37,7 +37,8 @@ public static List extractValidMethods(Class contract) { && parametersAreMatching(m) && !m.getName().toLowerCase().contains("event") && !m.getName().equals("load") - && !m.getName().equals("kill")) + && !m.getName().equals("kill") + && !m.getName().equals("linkLibraries")) .collect(Collectors.toList()); } diff --git a/codegen/src/test/java/org/web3j/codegen/SolidityFunctionWrapperGeneratorTest.java b/codegen/src/test/java/org/web3j/codegen/SolidityFunctionWrapperGeneratorTest.java index df795d1553..a8f51294d2 100644 --- a/codegen/src/test/java/org/web3j/codegen/SolidityFunctionWrapperGeneratorTest.java +++ b/codegen/src/test/java/org/web3j/codegen/SolidityFunctionWrapperGeneratorTest.java @@ -218,9 +218,9 @@ private void compareJavaFile(String inputFileName) throws Exception { "java", inputFileName + ".java"), File.separator)); - assertEquals( - new String(Files.readAllBytes(fileExpected.toPath())).replaceAll("(\r\n|\n)", ""), - new String(Files.readAllBytes(fileActual.toPath())).replaceAll("(\r\n|\n)", "")); + String s1 = new String(Files.readAllBytes(fileExpected.toPath())); + String s2 = new String(Files.readAllBytes(fileActual.toPath())); + assertEquals(s1.replaceAll("(\r\n|\n)", ""), s2.replaceAll("(\r\n|\n)", "")); } private void testCodeGenerationJvmTypes(String contractName, String inputFileName) diff --git a/codegen/src/test/resources/solidity/arraysinstruct/build/java/ArraysInStruct.java b/codegen/src/test/resources/solidity/arraysinstruct/build/java/ArraysInStruct.java index 9468b4373f..f9d4230770 100644 --- a/codegen/src/test/resources/solidity/arraysinstruct/build/java/ArraysInStruct.java +++ b/codegen/src/test/resources/solidity/arraysinstruct/build/java/ArraysInStruct.java @@ -39,7 +39,7 @@ */ @SuppressWarnings("rawtypes") public class ArraysInStruct extends Contract { - public static final String BINARY = "Bin file was not provided"; + public static String BINARY = "Bin file was not provided"; public static final String FUNC_CALLFUNCTION = "callFunction"; diff --git a/codegen/src/test/resources/solidity/eventparameters/build/java/EventParameters.java b/codegen/src/test/resources/solidity/eventparameters/build/java/EventParameters.java index 0fbc8ea5db..4fa13d61a1 100644 --- a/codegen/src/test/resources/solidity/eventparameters/build/java/EventParameters.java +++ b/codegen/src/test/resources/solidity/eventparameters/build/java/EventParameters.java @@ -37,7 +37,7 @@ */ @SuppressWarnings("rawtypes") public class EventParameters extends Contract { - public static final String BINARY = "Bin file was not provided"; + public static String BINARY = "Bin file was not provided"; public static final String FUNC__CONTRACTNUMBER = "_contractNumber"; diff --git a/codegen/src/test/resources/solidity/onlyinarraystruct/build/java/OnlyInArrayStruct.java b/codegen/src/test/resources/solidity/onlyinarraystruct/build/java/OnlyInArrayStruct.java index 044692b05e..0984956bcd 100644 --- a/codegen/src/test/resources/solidity/onlyinarraystruct/build/java/OnlyInArrayStruct.java +++ b/codegen/src/test/resources/solidity/onlyinarraystruct/build/java/OnlyInArrayStruct.java @@ -30,7 +30,7 @@ */ @SuppressWarnings("rawtypes") public class OnlyInArrayStruct extends Contract { - public static final String BINARY = "Bin file was not provided"; + public static String BINARY = "Bin file was not provided"; public static final String FUNC_GETFOO = "getFoo"; diff --git a/core/src/main/java/org/web3j/protocol/core/methods/response/Transaction.java b/core/src/main/java/org/web3j/protocol/core/methods/response/Transaction.java index 8762ac08ea..9f7ceff8f6 100644 --- a/core/src/main/java/org/web3j/protocol/core/methods/response/Transaction.java +++ b/core/src/main/java/org/web3j/protocol/core/methods/response/Transaction.java @@ -615,7 +615,11 @@ public int hashCode() { + (getMaxFeePerBlobGasRaw() != null ? getMaxFeePerBlobGasRaw().hashCode() : 0); - result = 31 * result + (getBlobVersionedHashes() != null ? getBlobVersionedHashes().hashCode() : 0); + result = + 31 * result + + (getBlobVersionedHashes() != null + ? getBlobVersionedHashes().hashCode() + : 0); result = 31 * result + (getAccessList() != null ? getAccessList().hashCode() : 0); return result; }