forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-22 04:36:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

resolve conflit

Browse source
This commit is contained in:
liam.lai 2025-11-20 00:18:34 +08:00 committed by benjamin202410
parent 5004ef060a
commit e9c21235c8
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
eth/api_backend.go
View file

@ -94,8 +94,8 @@ func (b *EthAPIBackend) HeaderByNumber(ctx context.Context, blockNr rpc.BlockNum
} else { } else {
return nil, errors.New("PoS V1 does not support confirmed block lookup") return nil, errors.New("PoS V1 does not support confirmed block lookup")
} }
} else if number.Int64() < 0 { } else if blockNr.Int64() < 0 {
return nil, fmt.Errorf("invalid block number %d", number.Int64()) return nil, fmt.Errorf("invalid block number %d", blockNr.Int64())
} }
header := b.eth.blockchain.GetHeaderByNumber(uint64(blockNr)) header := b.eth.blockchain.GetHeaderByNumber(uint64(blockNr))
if header == nil { if header == nil {
@ -146,8 +146,8 @@ func (b *EthAPIBackend) BlockByNumber(ctx context.Context, blockNr rpc.BlockNumb
} else { } else {
return nil, errors.New("PoS V1 does not support confirmed block lookup") return nil, errors.New("PoS V1 does not support confirmed block lookup")
} }
} else if number.Int64() < 0 { } else if blockNr.Int64() < 0 {
return nil, fmt.Errorf("invalid block number %d", number.Int64()) return nil, fmt.Errorf("invalid block number %d", blockNr.Int64())
} }
return b.eth.blockchain.GetBlockByNumber(uint64(blockNr)), nil return b.eth.blockchain.GetBlockByNumber(uint64(blockNr)), nil
} }