feat(api): rename JsonRpcErrorResolver, add unit test

Author: 0xbigapple

…/services/jsonrpc/TronErrorResolver.java …rvices/jsonrpc/JsonRpcErrorResolver.javaframework/src/main/java/org/tron/core/services/jsonrpc/TronErrorResolver.java renamed to framework/src/main/java/org/tron/core/services/jsonrpc/JsonRpcErrorResolver.java framework/src/main/java/org/tron/core/services/jsonrpc/TronErrorResolver.java renamed to framework/src/main/java/org/tron/core/services/jsonrpc/JsonRpcErrorResolver.java

@@ -1,13 +1,10 @@
 package org.tron.core.services.jsonrpc;
 
-import static com.googlecode.jsonrpc4j.ErrorResolver.JsonError.ERROR_NOT_HANDLED;
-
 import com.fasterxml.jackson.databind.JsonNode;
 import com.googlecode.jsonrpc4j.ErrorData;
 import com.googlecode.jsonrpc4j.ErrorResolver;
 import com.googlecode.jsonrpc4j.JsonRpcError;
 import com.googlecode.jsonrpc4j.JsonRpcErrors;
-
 import com.googlecode.jsonrpc4j.ReflectionUtil;
 import java.lang.reflect.Method;
 import java.util.List;
@@ -16,7 +13,7 @@
 /**
  * {@link ErrorResolver} that uses annotations.
  */
-public enum TronErrorResolver implements ErrorResolver {
+public enum JsonRpcErrorResolver implements ErrorResolver {
   INSTANCE;
 
   /**

framework/src/main/java/org/tron/core/services/jsonrpc/JsonRpcServlet.java

@@ -43,7 +43,7 @@ public void init(ServletConfig config) throws ServletException {
         true);
 
     rpcServer = new JsonRpcServer(compositeService);
-    rpcServer.setErrorResolver(TronErrorResolver.INSTANCE);
+    rpcServer.setErrorResolver(JsonRpcErrorResolver.INSTANCE);
 
     HttpStatusCodeProvider httpStatusCodeProvider = new HttpStatusCodeProvider() {
       @Override

framework/src/main/java/org/tron/core/services/jsonrpc/TronJsonRpcImpl.java

@@ -484,7 +484,7 @@ private String call(byte[] ownerAddressByte, byte[] contractAddressByte, long va
       }
 
       if (resData.length > 0) {
-        throw new JsonRpcInternalException(errMsg, "0x" + Hex.toHexString(resData));
+        throw new JsonRpcInternalException(errMsg, ByteArray.toJsonHex(resData));
       } else {
         throw new JsonRpcInternalException(errMsg);
       }

framework/src/test/java/org/tron/core/services/jsonrpc/JsonRpcErrorResolverTest.java

@@ -0,0 +1,43 @@
+package org.tron.core.services.jsonrpc;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.googlecode.jsonrpc4j.ErrorResolver.JsonError;
+import com.googlecode.jsonrpc4j.JsonRpcError;
+import com.googlecode.jsonrpc4j.JsonRpcErrors;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Test;
+import org.tron.core.exception.TronException;
+
+public class JsonRpcErrorResolverTest {
+
+  private final JsonRpcErrorResolver resolver = JsonRpcErrorResolver.INSTANCE;
+  private final int errorCode = -32000;
+
+  @JsonRpcErrors({
+            @JsonRpcError(exception = TronException.class, code = errorCode, data = "{}")
+    })
+  public void dummyMethod() {
+  }
+
+  @Test
+  public void testResolveErrorWithTronException() throws Exception {
+
+    String message = "JsonRPC ErrorMessage";
+    String data = "JsonRPC ErrorData";
+
+    TronException exception = new TronException(message, data);
+    Method method = this.getClass().getMethod("dummyMethod");
+    List<JsonNode> arguments = new ArrayList<>();
+
+    JsonError error = resolver.resolveError(exception, method, arguments);
+
+    Assert.assertNotNull(error);
+    Assert.assertEquals(errorCode, error.code);
+    Assert.assertEquals(message, error.message);
+    Assert.assertEquals(data, error.data);
+  }
+
+}