improve ContractCallException error message

cruanEzhou · cruanEzhou · commit 072e608a4b41 · 2019-09-30T11:27:15.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
@@ -115,9 +115,12 @@ private List<Type> executeCall(
     	JSONObject objTx = prepareCallParam(function);
         
         JSONObject ret = this.chainsql.connection.client.contractCall(objTx);
-        if(ret.has("error")){
-        	throw new ContractCallException(ret.getString("error"));
+        if(ret.has("error") && ret.has("error_message")){
+            throw new ContractCallException(ret.getString("error"),ret.getString("error_message"));
+        }else if(ret.has("error")){
+            throw new ContractCallException(ret.getString("error"));
         }
+
         return FunctionReturnDecoder.decode(ret.getString("contract_call_result"), function.getOutputParameters());
     }
     
diff --git a/chainsql/src/main/java/com/peersafe/chainsql/contract/exception/ContractCallException.java b/chainsql/src/main/java/com/peersafe/chainsql/contract/exception/ContractCallException.java
@@ -4,13 +4,13 @@
  * Exception resulting from issues calling methods on Smart Contracts.
  */
 public class ContractCallException extends RuntimeException {
-	public int error_code;
-    public ContractCallException(String message) {
-        super(message);
+	public String error;
+    public ContractCallException(String error) {
+        super(error);
     }
-    public ContractCallException(String message,int error_code) {
-    	super(message);
-    	this.error_code = error_code;
+    public ContractCallException(String error,String error_message) {
+    	super(error_message);
+    	this.error = error;
     }
     public ContractCallException(String message, Throwable cause) {
         super(message, cause);

Original file line number	Diff line number	Diff line change
`@@ -115,9 +115,12 @@ private List<Type> executeCall(`
`115`	`115`	`JSONObject objTx = prepareCallParam(function);`
`116`	`116`
`117`	`117`	`JSONObject ret = this.chainsql.connection.client.contractCall(objTx);`
`118`		`- if(ret.has("error")){`
`119`		`- throw new ContractCallException(ret.getString("error"));`
	`118`	`+ if(ret.has("error") && ret.has("error_message")){`
	`119`	`+ throw new ContractCallException(ret.getString("error"),ret.getString("error_message"));`
	`120`	`+ }else if(ret.has("error")){`
	`121`	`+ throw new ContractCallException(ret.getString("error"));`
`120`	`122`	`}`
	`123`	`+`
`121`	`124`	`return FunctionReturnDecoder.decode(ret.getString("contract_call_result"), function.getOutputParameters());`
`122`	`125`	`}`
`123`	`126`