Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
This commit is contained in:
commit
507830eb81
|
@ -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)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue