Patch for concurrent iterator & others (onto v1.11.6) #386

Closed
roysc wants to merge 1565 commits from v1.11.6-statediff-v5 into master
Showing only changes of commit 1e973a96b4 - Show all commits

View File

@ -19,6 +19,7 @@ package eth
import ( import (
"context" "context"
"errors" "errors"
"fmt"
"math/big" "math/big"
"time" "time"
@ -185,11 +186,11 @@ func (b *EthAPIBackend) GetLogs(ctx context.Context, hash common.Hash) ([][]*typ
db := b.eth.ChainDb() db := b.eth.ChainDb()
number := rawdb.ReadHeaderNumber(db, hash) number := rawdb.ReadHeaderNumber(db, hash)
if number == nil { if number == nil {
return nil, errors.New("failed to get block number from hash") return nil, fmt.Errorf("failed to get block number for hash %#x", hash)
} }
logs := rawdb.ReadLogs(db, hash, *number, b.eth.blockchain.Config()) logs := rawdb.ReadLogs(db, hash, *number, b.eth.blockchain.Config())
if logs == nil { if logs == nil {
return nil, errors.New("failed to get logs for block") return nil, fmt.Errorf("failed to get logs for block #%d (0x%s)", *number, hash.TerminalString())
} }
return logs, nil return logs, nil
} }