forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-23 05:06:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 90f03874ce into 323216ed85

Browse source
This commit is contained in:
Gustav Simonsson 2015-05-06 19:18:30 +00:00
commit 7d3e91b408
2 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/chain_manager.go
View file

@ -571,8 +571,15 @@ func (self *ChainManager) InsertChain(chain types.Blocks) (int, error) {
// Compare the TD of the last known block in the canonical chain to make sure it's greater. // Compare the TD of the last known block in the canonical chain to make sure it's greater.
// At this point it's possible that a different chain (fork) becomes the new canonical chain. // At this point it's possible that a different chain (fork) becomes the new canonical chain.
if block.Td.Cmp(self.td) > 0 { if block.Td.Cmp(self.td) > 0 {
//key := append(blockNumPre, block.Number().Bytes()...)
//self.blockDb.Put(key, block.Hash().Bytes())
// Check for chain forks. If H(block.num - 1) != block.parent, we're on a fork and need to do some merging // Check for chain forks. If H(block.num - 1) != block.parent, we're on a fork and need to do some merging
if previous := self.getBlockByNumber(block.NumberU64() - 1); previous.Hash() != block.ParentHash() { previous := self.getBlockByNumber(block.NumberU64() - 1)
if previous == nil {
glog.V(logger.Error).Infof("INVALID block #%v (%x)\n", block.Header().Number, block.Header().Hash().Bytes())
return i, BlockNumberErr
}
if previous.Hash() != block.ParentHash() {
chash := cblock.Hash() chash := cblock.Hash()
hash := block.Hash() hash := block.Hash()

18
core/chain_manager_test.go
View file

@ -241,6 +241,24 @@ func TestBrokenChain(t *testing.T) {
} }
} }
func TestChainForkWithWrongBlockNum(t *testing.T) {
db, _ := ethdb.NewMemDatabase()
genesis := GenesisBlock(db)
bc := chm(genesis, db)
chain1 := makeChainWithDiff(genesis, []int{1, 2, 3}, 10)
chain2 := makeChainWithDiff(genesis, []int{4, 5}, 11)
chain2[0].Header().Number = big.NewInt(int64(6))
chain2[1].Header().Number = big.NewInt(int64(7))
_, _ = bc.InsertChain(chain1)
_, err := bc.InsertChain(chain2)
if err != BlockNumberErr {
t.Errorf("should have failed with BlockNumberErr")
}
}
func TestChainInsertions(t *testing.T) { func TestChainInsertions(t *testing.T) {
t.Skip() // travil fails. t.Skip() // travil fails.