Fix test

hyperledger-web3j · Mar 13, 2024 · b9898fe · b9898fe
1 parent 1d56059
commit b9898fe
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 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
@@ -37,7 +37,8 @@ public static List<Method> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
     }