eth: goimports + minor refactor

This commit is contained in:
Martin Holst Swende 2018-12-20 14:10:09 +01:00 committed by Felix Lange
parent e8fef8c511
commit 753e74c241

View file

@ -18,9 +18,9 @@ package eth
import ( import (
"context" "context"
"errors"
"math/big" "math/big"
"errors"
"github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/math" "github.com/ethereum/go-ethereum/common/math"
@ -96,13 +96,12 @@ 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 {
//if the error is nil, let's create a generic error message instead of returning a fully null result
if err == nil {
err = errors.New("blockchain header is nil")
}
return nil, nil, err return nil, nil, err
} }
if header == nil {
return nil, nil, errors.New("header 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
} }