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

Remove old CalcTotalDiff function, improve code comments

Browse source
This commit is contained in:
Gustav Simonsson 2015-05-05 03:48:55 +02:00
parent fee99b3e8d
commit ff3a891afe
1 changed files with 4 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
core/chain_manager.go
View file

@ -74,10 +74,10 @@ type ChainManager struct {
processor types.BlockProcessor
eventMux *event.TypeMux
genesisBlock *types.Block
// Last known total difficulty
mu sync.RWMutex
tsmu sync.RWMutex
mu sync.RWMutex
tsmu sync.RWMutex
// Last known total difficulty
td *big.Int
currentBlock *types.Block
lastBlockHash common.Hash
@ -458,26 +458,6 @@ func (bc *ChainManager) setTotalDifficulty(td *big.Int) {
bc.td = td
}
func (self *ChainManager) CalcTotalDiff(block *types.Block) (*big.Int, error) {
parent := self.GetBlock(block.Header().ParentHash)
if parent == nil {
return nil, fmt.Errorf("Unable to calculate total diff without known parent %x", block.Header().ParentHash)
}
parentTd := parent.Td
uncleDiff := new(big.Int)
for _, uncle := range block.Uncles() {
uncleDiff = uncleDiff.Add(uncleDiff, uncle.Difficulty)
}
td := new(big.Int)
td = td.Add(parentTd, uncleDiff)
td = td.Add(td, block.Header().Difficulty)
return td, nil
}
func (bc *ChainManager) Stop() {
close(bc.quit)
@ -534,7 +514,7 @@ func (self *ChainManager) InsertChain(chain types.Blocks) (int, error) {
}
block.Td = new(big.Int)
// Do not penelise on future block. We'll need a block queue eventually that will queue
// Do not penalize on future block. We'll need a block queue eventually that will queue
// future block for future use
if err == BlockFutureErr {
block.SetQueued(true)