Skip to content

Commit 532dfe6

Browse files
committed
Revert "Bug fix for large binary with unlink libraries codegen"
This reverts commit 350560a.
1 parent b694fb7 commit 532dfe6

File tree

5 files changed

+7
-16
lines changed

5 files changed

+7
-16
lines changed

codegen/src/main/java/org/web3j/codegen/SolidityFunctionWrapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ private FieldSpec createLibrariesLinkedBinaryField() {
395395
.build();
396396
}
397397

398-
FieldSpec createBinaryDefinition(String binary) {
398+
private FieldSpec createBinaryDefinition(String binary) {
399399
if (binary.length() < 65534) {
400400
return FieldSpec.builder(String.class, BINARY)
401401
.addModifiers(Modifier.PUBLIC, Modifier.FINAL, Modifier.STATIC)
@@ -407,7 +407,7 @@ FieldSpec createBinaryDefinition(String binary) {
407407
StringBuilder stringBuilderString = new StringBuilder().append("new StringBuilder()");
408408
for (String s : argsArray) {
409409
stringBuilderString.append(".append(\"");
410-
stringBuilderString.append(s.replaceAll("\\$", "\\$\\$")); //escape $ which bytecode may contain
410+
stringBuilderString.append(s);
411411
stringBuilderString.append("\")");
412412
}
413413
stringBuilderString.append(".toString()");

codegen/src/test/java/org/web3j/codegen/SolidityFunctionWrapperGeneratorTest.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,6 @@ public void testContractWithLargeBinary() throws Exception {
9595
testCodeGenerationJvmTypes("large", "Large");
9696
}
9797

98-
@Test
99-
public void testContractWithLargeBinaryAndUnlinkedLib() throws Exception {
100-
testCodeGenerationJvmTypes("largewithunlinkedlib", "largewithunlinkedlib");
101-
}
102-
10398
@Test
10499
public void testShipIt() throws Exception {
105100
testCodeGenerationJvmTypes("shipit", "ShipIt");

codegen/src/test/java/org/web3j/codegen/SolidityFunctionWrapperTest.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@
1818
import java.util.Collections;
1919
import java.util.List;
2020

21-
import com.squareup.javapoet.*;
21+
import com.squareup.javapoet.ClassName;
22+
import com.squareup.javapoet.MethodSpec;
23+
import com.squareup.javapoet.ParameterizedTypeName;
24+
import com.squareup.javapoet.TypeName;
25+
import com.squareup.javapoet.TypeSpec;
2226
import org.junit.jupiter.api.BeforeEach;
2327
import org.junit.jupiter.api.Test;
2428

@@ -979,10 +983,4 @@ public void testBuildFunctionLinkBinaryWithReferences() throws Exception {
979983

980984
assertEquals(methodSpec.toString(), (expected));
981985
}
982-
983-
984-
@Test
985-
public void testBinaryWithUnlinkedLibraryLengthOver65534() throws Exception {
986-
solidityFunctionWrapper.createBinaryDefinition("0x" + "a".repeat(40000) + "__$927c5a12e2f339676f56d42ec1c0537964$__" + "a".repeat(40000));
987-
}
988986
}

codegen/src/test/resources/solidity/largewithunlinkedlib/build/LargeWithUnlinkedLib.abi

Lines changed: 0 additions & 1 deletion
This file was deleted.

codegen/src/test/resources/solidity/largewithunlinkedlib/build/LargeWithUnlinkedLib.bin

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)