status-im
/
op-geth
mirror of https://github.com/status-im/op-geth.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Return nil when requested uncle index is not valid

This commit is contained in:
Taylor Gerring 2015-04-02 16:12:19 +02:00
parent e882ba0c29
commit 537e2cfeb6
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rpc/api.go
View File

@ -253,13 +253,13 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
} }
if args.Index >= int64(len(br.Uncles)) || args.Index < 0 { if args.Index >= int64(len(br.Uncles)) || args.Index < 0 {
return NewValidationError("Index", "does not exist") // return NewValidationError("Index", "does not exist")
} *reply = nil
} else {
uhash := br.Uncles[args.Index] uhash := br.Uncles[args.Index]
uncle := NewBlockRes(api.xeth().EthBlockByHash(uhash.String()), false) uncle := NewBlockRes(api.xeth().EthBlockByHash(uhash.String()), true)
*reply = uncle *reply = uncle
}
case "eth_getUncleByBlockNumberAndIndex": case "eth_getUncleByBlockNumberAndIndex":
args := new(BlockNumIndexArgs) args := new(BlockNumIndexArgs)
if err := json.Unmarshal(req.Params, &args); err != nil { if err := json.Unmarshal(req.Params, &args); err != nil {
@ -275,13 +275,13 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
} }
if args.Index >= int64(len(v.Uncles)) || args.Index < 0 { if args.Index >= int64(len(v.Uncles)) || args.Index < 0 {
return NewValidationError("Index", "does not exist") // return NewValidationError("Index", "does not exist")
} *reply = nil
} else {
uhash := v.Uncles[args.Index] uhash := v.Uncles[args.Index]
uncle := NewBlockRes(api.xeth().EthBlockByHash(uhash.String()), false) uncle := NewBlockRes(api.xeth().EthBlockByHash(uhash.String()), false)
*reply = uncle *reply = uncle
}
case "eth_getCompilers": case "eth_getCompilers":
c := []string{""} c := []string{""}
*reply = c *reply = c