Revert "Bug fix for large binary with unlink libraries codegen"

This reverts commit 350560a.
hyperledger-web3j · Mar 16, 2024 · 532dfe6 · 532dfe6
1 parent b694fb7
commit 532dfe6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 16 deletions.
diff --git a/codegen/src/main/java/org/web3j/codegen/SolidityFunctionWrapper.java b/codegen/src/main/java/org/web3j/codegen/SolidityFunctionWrapper.java
@@ -395,7 +395,7 @@ private FieldSpec createLibrariesLinkedBinaryField() {
                 .build();
     }
 
-    FieldSpec createBinaryDefinition(String binary) {
+    private FieldSpec createBinaryDefinition(String binary) {
         if (binary.length() < 65534) {
             return FieldSpec.builder(String.class, BINARY)
                     .addModifiers(Modifier.PUBLIC, Modifier.FINAL, Modifier.STATIC)
@@ -407,7 +407,7 @@ FieldSpec createBinaryDefinition(String binary) {
         StringBuilder stringBuilderString = new StringBuilder().append("new StringBuilder()");
         for (String s : argsArray) {
             stringBuilderString.append(".append(\"");
-            stringBuilderString.append(s.replaceAll("\\$", "\\$\\$")); //escape $ which bytecode may contain
+            stringBuilderString.append(s);
             stringBuilderString.append("\")");
         }
         stringBuilderString.append(".toString()");

diff --git a/codegen/src/test/java/org/web3j/codegen/SolidityFunctionWrapperGeneratorTest.java b/codegen/src/test/java/org/web3j/codegen/SolidityFunctionWrapperGeneratorTest.java
@@ -95,11 +95,6 @@ public void testContractWithLargeBinary() throws Exception {
         testCodeGenerationJvmTypes("large", "Large");
     }
 
-    @Test
-    public void testContractWithLargeBinaryAndUnlinkedLib() throws Exception {
-        testCodeGenerationJvmTypes("largewithunlinkedlib", "largewithunlinkedlib");
-    }
-
     @Test
     public void testShipIt() throws Exception {
         testCodeGenerationJvmTypes("shipit", "ShipIt");

diff --git a/codegen/src/test/java/org/web3j/codegen/SolidityFunctionWrapperTest.java b/codegen/src/test/java/org/web3j/codegen/SolidityFunctionWrapperTest.java
@@ -18,7 +18,11 @@
 import java.util.Collections;
 import java.util.List;
 
-import com.squareup.javapoet.*;
+import com.squareup.javapoet.ClassName;
+import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.ParameterizedTypeName;
+import com.squareup.javapoet.TypeName;
+import com.squareup.javapoet.TypeSpec;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -979,10 +983,4 @@ public void testBuildFunctionLinkBinaryWithReferences() throws Exception {
 
         assertEquals(methodSpec.toString(), (expected));
     }
-
-
-    @Test
-    public void testBinaryWithUnlinkedLibraryLengthOver65534() throws Exception {
-        solidityFunctionWrapper.createBinaryDefinition("0x" + "a".repeat(40000) + "__$927c5a12e2f339676f56d42ec1c0537964$__" + "a".repeat(40000));
-    }
 }
diff --git a/codegen/src/test/resources/solidity/largewithunlinkedlib/build/LargeWithUnlinkedLib.abi b/codegen/src/test/resources/solidity/largewithunlinkedlib/build/LargeWithUnlinkedLib.abi
diff --git a/codegen/src/test/resources/solidity/largewithunlinkedlib/build/LargeWithUnlinkedLib.bin b/codegen/src/test/resources/solidity/largewithunlinkedlib/build/LargeWithUnlinkedLib.bin