Skip to content

G
Geth-Modification
Commit 7e1e2643 authored by Taylor Gerring's avatar Taylor Gerring
Browse files
Options

Don't return empty block for "pending" #568

parent 98f970ba
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
xeth/xeth.go
View file @ 7e1e2643
...@@ -144,12 +144,8 @@ func (self *XEth) Whisper() *Whisper { return self.whisper } ...@@ -144,12 +144,8 @@ func (self *XEth) Whisper() *Whisper { return self.whisper }
func (self *XEth) getBlockByHeight(height int64) *types.Block { func (self *XEth) getBlockByHeight(height int64) *types.Block {
var num uint64 var num uint64
// -1 means "latest" if height < 0 {
// -2 means "pending", which has no blocknum num = self.CurrentBlock().NumberU64() + uint64(-1*height)
if height <= -2 {
return &types.Block{}
} else if height == -1 {
num = self.CurrentBlock().NumberU64()
} else { } else {
num = uint64(height) num = uint64(height)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment