Feat/rpc-error-data

Acurast · Feb 7, 2024 · efe4d2b · efe4d2b
1 parent 6c52f05
commit efe4d2b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/rpc/src/main/kotlin/acurast/rpc/Rpc.kt b/rpc/src/main/kotlin/acurast/rpc/Rpc.kt
@@ -11,5 +11,6 @@ internal object JsonRpc {
         const val RESULT = "result"
         const val ERROR = "error"
         const val MESSAGE = "message"
+        const val DATA = "data"
     }
 }
diff --git a/rpc/src/main/kotlin/acurast/rpc/pallet/PalletRpc.kt b/rpc/src/main/kotlin/acurast/rpc/pallet/PalletRpc.kt
@@ -3,6 +3,7 @@ package acurast.rpc.pallet
 import acurast.rpc.JsonRpc
 import acurast.rpc.Rpc
 import acurast.rpc.engine.RpcEngine
+import acurast.rpc.utils.nullableOptString
 import com.google.gson.GsonBuilder
 import org.json.JSONArray
 import org.json.JSONObject
@@ -14,7 +15,11 @@ public abstract class PalletRpc(override val defaultEngine: RpcEngine) : Rpc {
 
     protected fun handleError(json: JSONObject): Exception =
         json.optJSONObject(JsonRpc.Key.ERROR)?.let { error ->
-            Exception(error.optString(JsonRpc.Key.MESSAGE))
+            val message = error.optString(JsonRpc.Key.MESSAGE)
+            val data = error.nullableOptString(JsonRpc.Key.DATA)
+            val exceptionMessage = data?.let { "$message ($it)" } ?: message
+
+            Exception(exceptionMessage)
         } ?: Exception("something went wrong")
 
     protected inline fun <reified R> parseJSON(json: String): R =