Skip to content

Commit 1d56059

Browse files
committed
spotless apply
1 parent e8afcda commit 1d56059

File tree

4 files changed

+33
-15
lines changed

4 files changed

+33
-15
lines changed

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

+12-5
Original file line numberDiff line numberDiff line change
@@ -1460,13 +1460,20 @@ List<MethodSpec> buildFunctions(
14601460
MethodSpec buildLinkLibraryMethod() {
14611461
MethodSpec.Builder methodBuilder =
14621462
MethodSpec.methodBuilder("linkLibraries")
1463-
.addModifiers(Modifier.PUBLIC, Modifier.STATIC)
1464-
.addParameter(ParameterizedTypeName.get(
1465-
ClassName.get(List.class), ClassName.get(Contract.LinkReference.class)), "references")
1466-
.addStatement(BINARY + " = " + "linkBinaryWithReferences(" + BINARY + ", references)");
1463+
.addModifiers(Modifier.PUBLIC, Modifier.STATIC)
1464+
.addParameter(
1465+
ParameterizedTypeName.get(
1466+
ClassName.get(List.class),
1467+
ClassName.get(Contract.LinkReference.class)),
1468+
"references")
1469+
.addStatement(
1470+
BINARY
1471+
+ " = "
1472+
+ "linkBinaryWithReferences("
1473+
+ BINARY
1474+
+ ", references)");
14671475

14681476
return methodBuilder.build();
1469-
14701477
}
14711478

14721479
private void buildConstantFunction(

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

+12-2
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,18 @@ public void testLinkBinaryWithReferences() throws Exception {
8989
Contract mc = parseContractJson(contractBaseDir, "MetaCoin", "MetaCoin");
9090
assertTrue(mc.getBytecode().contains("__ConvertLib____________________________"));
9191

92-
String linked = linkBinaryWithReferences(mc.getBytecode(), Collections.singletonList(new org.web3j.tx.Contract.LinkReference("./ConvertLib.sol", "ConvertLib" , Address.DEFAULT)));
92+
String linked =
93+
linkBinaryWithReferences(
94+
mc.getBytecode(),
95+
Collections.singletonList(
96+
new org.web3j.tx.Contract.LinkReference(
97+
"./ConvertLib.sol", "ConvertLib", Address.DEFAULT)));
9398
assertFalse(linked.contains("__ConvertLib____________________________"));
94-
assertEquals(mc.getBytecode().replace("__ConvertLib____________________________", Address.DEFAULT.toString().substring(2)), linked);
99+
assertEquals(
100+
mc.getBytecode()
101+
.replace(
102+
"__ConvertLib____________________________",
103+
Address.DEFAULT.toString().substring(2)),
104+
linked);
95105
}
96106
}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -977,9 +977,9 @@ public void testBuildFunctionLinkBinaryWithReferences() throws Exception {
977977
MethodSpec methodSpec = solidityFunctionWrapper.buildLinkLibraryMethod();
978978

979979
String expected =
980-
"public static void linkLibraries(java.util.List<org.web3j.tx.Contract.LinkReference> references) {\n" +
981-
" BINARY = linkBinaryWithReferences(BINARY, references);\n" +
982-
"}\n";
980+
"public static void linkLibraries(java.util.List<org.web3j.tx.Contract.LinkReference> references) {\n"
981+
+ " BINARY = linkBinaryWithReferences(BINARY, references);\n"
982+
+ "}\n";
983983

984984
assertEquals(methodSpec.toString(), (expected));
985985
}

core/src/main/java/org/web3j/tx/Contract.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -501,17 +501,18 @@ public LinkReference(String source, String libraryName, Address address) {
501501
}
502502
}
503503

504-
public static String linkBinaryWithReferences(String binary, List<LinkReference> links){
504+
public static String linkBinaryWithReferences(String binary, List<LinkReference> links) {
505505
String replacingBinary = binary;
506-
for(LinkReference link: links) {
507-
//solc / hardhat convention
506+
for (LinkReference link : links) {
507+
// solc / hardhat convention
508508
String libSourceName = link.source + ":" + link.libraryName;
509509
String placeHolder = "__$" + sha3String(libSourceName).substring(2, 36) + "$__";
510510
String addressReplacement = cleanHexPrefix(link.address.toString());
511511
replacingBinary = replacingBinary.replace(placeHolder, addressReplacement);
512512

513-
//truffle old version
514-
String trufflePlaceHolder = "__" + link.libraryName + "_".repeat(40 - link.libraryName.length() - 2);
513+
// truffle old version
514+
String trufflePlaceHolder =
515+
"__" + link.libraryName + "_".repeat(40 - link.libraryName.length() - 2);
515516
replacingBinary = replacingBinary.replace(trufflePlaceHolder, addressReplacement);
516517
}
517518
return replacingBinary;

0 commit comments

Comments
 (0)