This commit is contained in:
Ronan 2017-09-11 11:02:40 +00:00 committed by GitHub
commit aa6b8e25da

View file

@ -18,7 +18,9 @@ package eth
import ( import (
"context" "context"
"errors"
"math/big" "math/big"
"strconv"
"github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
@ -89,9 +91,13 @@ func (b *EthApiBackend) StateAndHeaderByNumber(ctx context.Context, blockNr rpc.
} }
// Otherwise resolve the block number and return its state // Otherwise resolve the block number and return its state
header, err := b.HeaderByNumber(ctx, blockNr) header, err := b.HeaderByNumber(ctx, blockNr)
if header == nil || err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
// If can't find specified block return an error
if header == nil {
return nil, nil, errors.New("block " + strconv.FormatInt(int64(blockNr), 10) + " not found")
}
stateDb, err := b.eth.BlockChain().StateAt(header.Root) stateDb, err := b.eth.BlockChain().StateAt(header.Root)
return stateDb, header, err return stateDb, header, err
} }