gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Convert to proper errors

Browse Source 
Allow returning different JSON RPC error codes depending on error type
This commit is contained in:
Taylor Gerring
2015-03-12 19:07:03 -05:00
parent 14bdcd2c05
commit 094f921e50
5 changed files with 183 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rpc/util.go
View File

@ -42,7 +42,7 @@ type JsonWrapper struct{}
func UnmarshalRawMessages(b []byte, iface interface{}, number *int64) (err error) {
var data []json.RawMessage
if err = json.Unmarshal(b, &data); err != nil && len(data) == 0 {
return errDecodeArgs
return NewDecodeParamError(err.Error())
}
// Number index determines the index in the array for a possible block number
@ -74,7 +74,7 @@ func UnmarshalRawMessages(b []byte, iface interface{}, number *int64) (err error
fallthrough
default:
if err = json.Unmarshal(data[0], iface); err != nil {
return errDecodeArgs
return NewDecodeParamError(err.Error())
}
numberIndex = 1
}
@ -82,7 +82,7 @@ func UnmarshalRawMessages(b []byte, iface interface{}, number *int64) (err error
// <0 index means out of bound for block number
if numberIndex >= 0 && len(data) > numberIndex {
if err = blockNumber(data[numberIndex], number); err != nil {
return errDecodeArgs
return NewDecodeParamError(err.Error())
}
}