Support contract to return structure and structure array

xiuxiufxx · xiuxiufxx · commit e31cdfb5bb59 · 2022-07-07T12:11:52.000+08:00
diff --git a/chainsql/src/main/java/com/peersafe/chainsql/contract/Contract.java b/chainsql/src/main/java/com/peersafe/chainsql/contract/Contract.java
@@ -186,7 +186,9 @@ protected <T extends Type, R> R executeCallSingleValueReturn(
         }
 
         Object value = result.getValue();
-        if (returnType.isAssignableFrom(value.getClass())) {
+        if (returnType.isAssignableFrom(result.getClass())) {
+        	return (R) result;
+        } else if (returnType.isAssignableFrom(value.getClass())) {
             return (R) value;
         } else if (result.getClass().equals(Address.class) && returnType.equals(String.class)) {
             return (R) result.toString();  // cast isn't necessary
@@ -208,7 +210,9 @@ public void called(T result) {
 		        }
 
 		        Object value = result.getValue();
-		        if (returnType.isAssignableFrom(value.getClass())) {
+		        if (returnType.isAssignableFrom(result.getClass())) {
+		        	cb.called((R) result);
+		        } else if (returnType.isAssignableFrom(value.getClass())) {
 		            cb.called((R) value);
 		        } else if (result.getClass().equals(Address.class) && returnType.equals(String.class)) {
 		        	cb.called((R) result.toString());  // cast isn't necessary
