Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
f0e94b4d
Commit
f0e94b4d
authored
Jul 03, 2015
by
Bas van Kervel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
display rpc error in console
parent
cf668262
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
13 deletions
+15
-13
json.go
rpc/codec/json.go
+5
-5
jeth.go
rpc/jeth.go
+10
-8
No files found.
rpc/codec/json.go
View file @
f0e94b4d
...
@@ -156,15 +156,15 @@ func (self *JsonCodec) ReadResponse() (interface{}, error) {
...
@@ -156,15 +156,15 @@ func (self *JsonCodec) ReadResponse() (interface{}, error) {
}
}
bytesInBuffer
+=
n
bytesInBuffer
+=
n
var
failure
shared
.
ErrorResponse
if
err
=
json
.
Unmarshal
(
buf
[
:
bytesInBuffer
],
&
failure
);
err
==
nil
&&
failure
.
Error
!=
nil
{
return
failure
,
fmt
.
Errorf
(
failure
.
Error
.
Message
)
}
var
success
shared
.
SuccessResponse
var
success
shared
.
SuccessResponse
if
err
=
json
.
Unmarshal
(
buf
[
:
bytesInBuffer
],
&
success
);
err
==
nil
{
if
err
=
json
.
Unmarshal
(
buf
[
:
bytesInBuffer
],
&
success
);
err
==
nil
{
return
success
,
nil
return
success
,
nil
}
}
var
failure
shared
.
ErrorResponse
if
err
=
json
.
Unmarshal
(
buf
[
:
bytesInBuffer
],
&
failure
);
err
==
nil
&&
failure
.
Error
!=
nil
{
return
failure
,
nil
}
}
}
self
.
c
.
Close
()
self
.
c
.
Close
()
...
...
rpc/jeth.go
View file @
f0e94b4d
...
@@ -3,6 +3,8 @@ package rpc
...
@@ -3,6 +3,8 @@ package rpc
import
(
import
(
"encoding/json"
"encoding/json"
"fmt"
"github.com/ethereum/go-ethereum/jsre"
"github.com/ethereum/go-ethereum/jsre"
"github.com/ethereum/go-ethereum/rpc/comms"
"github.com/ethereum/go-ethereum/rpc/comms"
"github.com/ethereum/go-ethereum/rpc/shared"
"github.com/ethereum/go-ethereum/rpc/shared"
...
@@ -20,14 +22,13 @@ func NewJeth(ethApi shared.EthereumApi, re *jsre.JSRE, client comms.EthereumClie
...
@@ -20,14 +22,13 @@ 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
)
{
func
(
self
*
Jeth
)
err
(
call
otto
.
FunctionCall
,
code
int
,
msg
string
,
id
interface
{})
(
response
otto
.
Value
)
{
rpcerr
:=
&
shared
.
ErrorObject
{
code
,
msg
}
errObj
:=
fmt
.
Sprintf
(
"{
\"
message
\"
:
\"
%s
\"
,
\"
code
\"
: %d}"
,
msg
,
code
)
call
.
Otto
.
Set
(
"ret_jsonrpc"
,
shared
.
JsonRpcVersion
)
retResponse
:=
fmt
.
Sprintf
(
"ret_response = JSON.parse('{
\"
jsonrpc
\"
:
\"
%s
\"
,
\"
id
\"
: %v,
\"
error
\"
: %s}');"
,
shared
.
JsonRpcVersion
,
id
,
errObj
)
call
.
Otto
.
Set
(
"ret_id"
,
id
)
call
.
Otto
.
Set
(
"ret_error"
,
rpcerr
)
call
.
Otto
.
Run
(
"ret_error = "
+
errObj
)
response
,
_
=
call
.
Otto
.
Run
(
`
res
,
_
:=
call
.
Otto
.
Run
(
retResponse
)
ret_response = { jsonrpc: ret_jsonrpc, id: ret_id, error: ret_error };
`
)
return
res
return
}
}
func
(
self
*
Jeth
)
Send
(
call
otto
.
FunctionCall
)
(
response
otto
.
Value
)
{
func
(
self
*
Jeth
)
Send
(
call
otto
.
FunctionCall
)
(
response
otto
.
Value
)
{
...
@@ -56,6 +57,7 @@ func (self *Jeth) Send(call otto.FunctionCall) (response otto.Value) {
...
@@ -56,6 +57,7 @@ func (self *Jeth) Send(call otto.FunctionCall) (response otto.Value) {
return
self
.
err
(
call
,
-
32603
,
err
.
Error
(),
req
.
Id
)
return
self
.
err
(
call
,
-
32603
,
err
.
Error
(),
req
.
Id
)
}
}
respif
,
err
=
self
.
client
.
Recv
()
respif
,
err
=
self
.
client
.
Recv
()
if
err
!=
nil
{
if
err
!=
nil
{
return
self
.
err
(
call
,
-
32603
,
err
.
Error
(),
req
.
Id
)
return
self
.
err
(
call
,
-
32603
,
err
.
Error
(),
req
.
Id
)
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment