<fix>(v2,v3): fix static struct static array bug. (#30)

FISCO-BCOS · Feb 29, 2024 · 9cc1b17 · 9cc1b17
1 parent 1f13f82
commit 9cc1b17
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -31,7 +31,7 @@ ext {
     commonsLang3Version = '3.12.0'
 
     javaSDKVersion3 = "3.6.0"
-    javaSDKVersion2 = "2.9.1"
+    javaSDKVersion2 = "2.10.0-SNAPSHOT"
     slf4jVersion = "1.7.32"
 }
 
@@ -50,7 +50,7 @@ sourceSets {
 // integrationTest.mustRunAfter test
 allprojects {
     group = 'org.fisco-bcos.code-generator'
-    version = '1.3.0'
+    version = '1.4.0-SNAPSHOT'
     apply plugin: 'maven-publish'
     apply plugin: 'idea'
     apply plugin: 'eclipse'

diff --git a/src/main/java/org/fisco/bcos/codegen/v2/wrapper/SolidityContractWrapper.java b/src/main/java/org/fisco/bcos/codegen/v2/wrapper/SolidityContractWrapper.java
@@ -1651,6 +1651,11 @@ private List<TypeSpec> buildStructTypes(List<ABIDefinition> functionDefinitions)
                 if (namedType.getType().equals("tuple[]") && internalType.endsWith("[]")) {
                     internalType = internalType.substring(0, internalType.lastIndexOf("["));
                 }
+                if (namedType.getType().matches("tuple\\[\\d+\\]")
+                        && internalType.endsWith("]")
+                        && internalType.matches(".*\\[\\d+\\]")) {
+                    internalType = internalType.substring(0, internalType.lastIndexOf("["));
+                }
                 if (internalType.contains(".")) {
                     structName = internalType.substring(internalType.lastIndexOf(".") + 1);
                 } else {

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
@@ -416,6 +416,11 @@ private List<TypeSpec> buildStructTypes(List<ABIDefinition> functionDefinitions)
                 if (namedType.getType().equals("tuple[]") && internalType.endsWith("[]")) {
                     internalType = internalType.substring(0, internalType.lastIndexOf("["));
                 }
+                if (namedType.getType().matches("tuple\\[\\d+\\]")
+                        && internalType.endsWith("]")
+                        && internalType.matches(".*\\[\\d+\\]")) {
+                    internalType = internalType.substring(0, internalType.lastIndexOf("["));
+                }
                 if (isWasm) {
                     structName = internalType.substring(internalType.lastIndexOf(".") + 1);
                 } else {

diff --git a/src/test/java/org/fisco/bcos/codegen/v2/test/CodeGenV2Test.java b/src/test/java/org/fisco/bcos/codegen/v2/test/CodeGenV2Test.java
@@ -72,6 +72,13 @@ public void complexABICodeGen() throws IOException {
         codeGenTest(COMPLEX_ABI_FILE, COMPLEX_NAME);
     }
 
+    @Test
+    public void complexABICodeGen2() throws IOException {
+        final String COMPLEX_ABI_FILE = "ComplexCodecTest2.abi";
+        final String COMPLEX_NAME = "ComplexCodecTest";
+        codeGenTest(COMPLEX_ABI_FILE, COMPLEX_NAME);
+    }
+
     @Test
     public void tableABICodeGen() throws IOException {
         final String ABI_FILE = "Table.abi";

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
@@ -88,6 +88,13 @@ public void complexABICodeGen() throws IOException {
         codeGenTest(COMPLEX_ABI_FILE, COMPLEX_NAME);
     }
 
+    @Test
+    public void complexABICodeGen2() throws IOException {
+        final String COMPLEX_ABI_FILE = "ComplexCodecTest2.abi";
+        final String COMPLEX_NAME = "ComplexCodecTest";
+        codeGenTest(COMPLEX_ABI_FILE, COMPLEX_NAME);
+    }
+
     @Test
     public void tableABICodeGen() throws IOException {
         final String ABI_FILE = "Table.abi";