diff options
| author | Felix Lange <fjl@twurst.com> | 2015-08-27 00:55:31 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-08-27 00:55:31 +0800 |
| commit | 3df6f3fc14e3a6947cf7217101a55550fc6212f9 (patch) | |
| tree | 363cc81b7c758a398818aebd6e092dfd499f6843 /rpc/jeth.go | |
| parent | 847794a321e9bc46d9b9a9d7c90a520a0fb75c19 (diff) | |
| parent | f448310eef5abf1dfd10b25bfd22466cb5477dfd (diff) | |
| download | dexon-3df6f3fc14e3a6947cf7217101a55550fc6212f9.tar dexon-3df6f3fc14e3a6947cf7217101a55550fc6212f9.tar.gz dexon-3df6f3fc14e3a6947cf7217101a55550fc6212f9.tar.bz2 dexon-3df6f3fc14e3a6947cf7217101a55550fc6212f9.tar.lz dexon-3df6f3fc14e3a6947cf7217101a55550fc6212f9.tar.xz dexon-3df6f3fc14e3a6947cf7217101a55550fc6212f9.tar.zst dexon-3df6f3fc14e3a6947cf7217101a55550fc6212f9.zip | |
Merge pull request #1721 from bas-vk/console-error-parsing
Improved console error handling
Diffstat (limited to 'rpc/jeth.go')
| -rw-r--r-- | rpc/jeth.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/rpc/jeth.go b/rpc/jeth.go index 757f6b7eb..ae2603ae4 100644 --- a/rpc/jeth.go +++ b/rpc/jeth.go @@ -44,11 +44,12 @@ func NewJeth(ethApi shared.EthereumApi, re *jsre.JSRE, client comms.EthereumClie } func (self *Jeth) err(call otto.FunctionCall, code int, msg string, id interface{}) (response otto.Value) { - errObj := fmt.Sprintf("{\"message\": \"%s\", \"code\": %d}", msg, code) - retResponse := fmt.Sprintf("ret_response = JSON.parse('{\"jsonrpc\": \"%s\", \"id\": %v, \"error\": %s}');", shared.JsonRpcVersion, id, errObj) + m := shared.NewRpcErrorResponse(id, shared.JsonRpcVersion, code, fmt.Errorf(msg)) + errObj, _ := json.Marshal(m.Error) + errRes, _ := json.Marshal(m) - call.Otto.Run("ret_error = " + errObj) - res, _ := call.Otto.Run(retResponse) + call.Otto.Run("ret_error = " + string(errObj)) + res, _ := call.Otto.Run("ret_response = " + string(errRes)) return res } |