From 2fc7f8878544bb7b46ce8357a64b9e920195a243 Mon Sep 17 00:00:00 2001 From: bojie Date: Mon, 14 Jan 2019 20:42:15 +0800 Subject: app: remove pending block logic (#149) --- dex/api_backend.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'dex/api_backend.go') diff --git a/dex/api_backend.go b/dex/api_backend.go index c00a54145..719625946 100644 --- a/dex/api_backend.go +++ b/dex/api_backend.go @@ -60,7 +60,7 @@ func (b *DexAPIBackend) SetHead(number uint64) { func (b *DexAPIBackend) HeaderByNumber(ctx context.Context, blockNr rpc.BlockNumber) (*types.Header, error) { // Otherwise resolve and return the block - if blockNr == rpc.LatestBlockNumber { + if blockNr == rpc.LatestBlockNumber || blockNr == rpc.PendingBlockNumber { return b.dex.blockchain.CurrentBlock().Header(), nil } return b.dex.blockchain.GetHeaderByNumber(uint64(blockNr)), nil @@ -79,10 +79,6 @@ func (b *DexAPIBackend) BlockByNumber(ctx context.Context, blockNr rpc.BlockNumb } func (b *DexAPIBackend) StateAndHeaderByNumber(ctx context.Context, blockNr rpc.BlockNumber) (*state.StateDB, *types.Header, error) { - if blockNr == rpc.PendingBlockNumber { - block, state := b.dex.BlockChain().GetPending() - return state, block.Header(), nil - } header, err := b.HeaderByNumber(ctx, blockNr) if header == nil || err != nil { return nil, nil, err -- cgit v1.2.3