From 7e1e264375fe4bebbf6bb40604d0060744ebae2a Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Thu, 26 Mar 2015 09:24:07 +0100 Subject: Don't return empty block for "pending" #568 --- xeth/xeth.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/xeth/xeth.go b/xeth/xeth.go index 25fdb8c89..bf30fc2fc 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -144,12 +144,8 @@ func (self *XEth) Whisper() *Whisper { return self.whisper } func (self *XEth) getBlockByHeight(height int64) *types.Block { var num uint64 - // -1 means "latest" - // -2 means "pending", which has no blocknum - if height <= -2 { - return &types.Block{} - } else if height == -1 { - num = self.CurrentBlock().NumberU64() + if height < 0 { + num = self.CurrentBlock().NumberU64() + uint64(-1*height) } else { num = uint64(height) } -- cgit