aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-01-09 20:37:15 +0800
committerobscuren <geffobscura@gmail.com>2015-01-09 20:37:15 +0800
commita35be3a12a874358e4cc7ed8ab0db0e51b509953 (patch)
tree39948c5f33dd257f5fae042a3b678f81346da55d /core
parentf9b0d1a8e738a207e6101b27b667ea390def9f69 (diff)
parentb3161f5803fdab9531c611659b7827ff1a2699dd (diff)
downloaddexon-a35be3a12a874358e4cc7ed8ab0db0e51b509953.tar
dexon-a35be3a12a874358e4cc7ed8ab0db0e51b509953.tar.gz
dexon-a35be3a12a874358e4cc7ed8ab0db0e51b509953.tar.bz2
dexon-a35be3a12a874358e4cc7ed8ab0db0e51b509953.tar.lz
dexon-a35be3a12a874358e4cc7ed8ab0db0e51b509953.tar.xz
dexon-a35be3a12a874358e4cc7ed8ab0db0e51b509953.tar.zst
dexon-a35be3a12a874358e4cc7ed8ab0db0e51b509953.zip
Merge branch 'develop' of https://github.com/ethersphere/go-ethereum into ethersphere-develop
Diffstat (limited to 'core')
-rw-r--r--core/chain_manager.go4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/chain_manager.go b/core/chain_manager.go
index 5ff3b88c9..3e0a3fb23 100644
--- a/core/chain_manager.go
+++ b/core/chain_manager.go
@@ -238,13 +238,11 @@ func (self *ChainManager) GetBlockHashesFromHash(hash []byte, max uint64) (chain
// XXX Could be optimised by using a different database which only holds hashes (i.e., linked list)
for i := uint64(0); i < max; i++ {
+ block = self.GetBlock(block.Header().ParentHash)
chain = append(chain, block.Hash())
-
if block.Header().Number.Cmp(ethutil.Big0) <= 0 {
break
}
-
- block = self.GetBlock(block.Header().ParentHash)
}
return