<fix>(v3): fix v3 codeGen wrapper use v1 tx generate constructor bug.

FISCO-BCOS · Jan 10, 2024 · 426e3f2 · 426e3f2
1 parent b09d86d
commit 426e3f2
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 21 deletions.
diff --git a/src/main/java/org/fisco/bcos/codegen/v3/wrapper/ContractWrapper.java b/src/main/java/org/fisco/bcos/codegen/v3/wrapper/ContractWrapper.java
@@ -143,6 +143,9 @@ public void generateJavaFiles(
         classBuilder.addMethod(buildGetBinaryMethod());
         classBuilder.addMethod(buildGetABIMethod());
         classBuilder.addMethod(buildConstructor());
+        if (this.transactionVersion == CodeGenMain.TransactionVersion.V1.getV()) {
+            classBuilder.addMethod(buildTransactionV1Constructor());
+        }
 
         classBuilder.addFields(this.buildFuncNameConstants(abiDefinitions));
         classBuilder.addTypes(this.buildStructTypes(abiDefinitions));
@@ -669,8 +672,29 @@ private static MethodSpec buildGetABIMethod() {
     }
 
     private MethodSpec buildConstructor() {
-        MethodSpec.Builder toReturn;
+        MethodSpec.Builder toReturn =
+                MethodSpec.constructorBuilder()
+                        .addModifiers(Modifier.PROTECTED)
+                        .addParameter(String.class, CONTRACT_ADDRESS)
+                        .addParameter(Client.class, CLIENT)
+                        .addParameter(CryptoKeyPair.class, ContractWrapper.CREDENTIAL)
+                        .addStatement(
+                                "super($N, $N, $N, $N)",
+                                getBinaryFuncDefinition(),
+                                CONTRACT_ADDRESS,
+                                CLIENT,
+                                ContractWrapper.CREDENTIAL);
+        toReturn.addStatement(
+                "this.$N = new $T($N)",
+                ContractWrapper.TRANSACTION_MANAGER,
+                ProxySignTransactionManager.class,
+                CLIENT);
+        return toReturn.build();
+    }
+
+    private MethodSpec buildTransactionV1Constructor() {
         if (this.transactionVersion == CodeGenMain.TransactionVersion.V1.getV()) {
+            MethodSpec.Builder toReturn;
             toReturn =
                     MethodSpec.constructorBuilder()
                             .addModifiers(Modifier.PROTECTED)
@@ -684,21 +708,9 @@ private MethodSpec buildConstructor() {
                                     CONTRACT_ADDRESS,
                                     CLIENT,
                                     ContractWrapper.TRANSACTION_MANAGER);
-        } else {
-            toReturn =
-                    MethodSpec.constructorBuilder()
-                            .addModifiers(Modifier.PROTECTED)
-                            .addParameter(String.class, CONTRACT_ADDRESS)
-                            .addParameter(Client.class, CLIENT)
-                            .addParameter(CryptoKeyPair.class, ContractWrapper.CREDENTIAL)
-                            .addStatement(
-                                    "super($N, $N, $N, $N)",
-                                    getBinaryFuncDefinition(),
-                                    CONTRACT_ADDRESS,
-                                    CLIENT,
-                                    ContractWrapper.CREDENTIAL);
+            return toReturn.build();
         }
-        return toReturn.build();
+        return null;
     }
 
     private MethodSpec buildDeploy(

diff --git a/src/test/java/org/fisco/bcos/codegen/v3/test/CodeGenV3Test.java b/src/test/java/org/fisco/bcos/codegen/v3/test/CodeGenV3Test.java
@@ -7,7 +7,9 @@
 import java.io.OutputStream;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import javax.tools.DiagnosticCollector;
 import javax.tools.JavaCompiler;
@@ -18,8 +20,22 @@
 import org.fisco.bcos.codegen.CodeGenMain;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
+@RunWith(Parameterized.class)
 public class CodeGenV3Test {
+
+    @Parameterized.Parameter public boolean useV1Tx;
+
+    @Parameterized.Parameters
+    public static Collection<Object[]> data() {
+        return Arrays.asList(
+                new Object[][] {
+                    {false}, {true},
+                });
+    }
+
     private static final String JAVA_OUTPUT_DIR = "sdk";
     private static final String DEFAULT_PACKAGE = "com";
 
@@ -148,8 +164,9 @@ private void codeGenTest(String abiFileName, String codeFilePath, String contrac
         String abiFile = CodeGenV3Test.class.getClassLoader().getResource(abiFileName).getPath();
         String binFile = CodeGenV3Test.class.getClassLoader().getResource(codeFilePath).getPath();
         String javaOutPut = new File(abiFile).getParent() + File.separator + JAVA_OUTPUT_DIR;
-        CodeGenMain.main(
-                Arrays.asList(
+        ArrayList<String> args =
+                new ArrayList<>(
+                        Arrays.asList(
                                 "-v",
                                 "V3",
                                 "-a",
@@ -162,10 +179,13 @@ private void codeGenTest(String abiFileName, String codeFilePath, String contrac
                                 DEFAULT_PACKAGE,
                                 "-o",
                                 javaOutPut,
-                                "-e",
-                                "-t",
-                                "V1")
-                        .toArray(new String[0]));
+                                "-e"));
+
+        if (useV1Tx) {
+            args.add("-t");
+            args.add("V1");
+        }
+        CodeGenMain.main(args.toArray(new String[0]));
         JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
         DiagnosticCollector<JavaFileObject> collector = new DiagnosticCollector<>();
         JavaFileManager javaFileManager =