roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

More nil checks

Browse Source
This commit is contained in:
Taylor Gerring 2015-04-02 14:54:28 +02:00
parent 172b34351a
commit 876ce0fb12
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpc/api.go
View File

@ -212,6 +212,9 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
block := api.xeth().EthBlockByHash(args.Hash) block := api.xeth().EthBlockByHash(args.Hash)
br := NewBlockRes(block, true) br := NewBlockRes(block, true)
if br == nil {
*reply = nil
}
if args.Index >= int64(len(br.Transactions)) || args.Index < 0 { if args.Index >= int64(len(br.Transactions)) || args.Index < 0 {
return NewValidationError("Index", "does not exist") return NewValidationError("Index", "does not exist")
@ -225,6 +228,9 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
block := api.xeth().EthBlockByNumber(args.BlockNumber) block := api.xeth().EthBlockByNumber(args.BlockNumber)
v := NewBlockRes(block, true) v := NewBlockRes(block, true)
if v == nil {
*reply = nil
}
if args.Index >= int64(len(v.Transactions)) || args.Index < 0 { if args.Index >= int64(len(v.Transactions)) || args.Index < 0 {
return NewValidationError("Index", "does not exist") return NewValidationError("Index", "does not exist")

6
rpc/responses.go
View File

@ -125,8 +125,6 @@ func (b *BlockRes) MarshalJSON() ([]byte, error) {
} }
func NewBlockRes(block *types.Block, fullTx bool) *BlockRes { func NewBlockRes(block *types.Block, fullTx bool) *BlockRes {
// TODO respect fullTx flag
if block == nil { if block == nil {
return nil return nil
} }
@ -182,6 +180,10 @@ type TransactionRes struct {
} }
func NewTransactionRes(tx *types.Transaction) *TransactionRes { func NewTransactionRes(tx *types.Transaction) *TransactionRes {
if tx == nil {
return nil
}
var v = new(TransactionRes) var v = new(TransactionRes)
v.Hash = newHexData(tx.Hash()) v.Hash = newHexData(tx.Hash())
v.Nonce = newHexNum(tx.Nonce()) v.Nonce = newHexNum(tx.Nonce())