Combined two loops

release/1.0.1
Vitalik Buterin 10 years ago
parent fca3333f7f
commit bdec8c3e41
  1. 4
      miner/worker.go

@ -266,14 +266,12 @@ func (self *worker) makeCurrent() {
block.Header().Extra = self.extra block.Header().Extra = self.extra
current := env(block, self.eth) current := env(block, self.eth)
for _, ancestor := range self.chain.GetAncestors(block, 7) {
current.ancestors.Add(ancestor.Hash())
}
for _, ancestor := range self.chain.GetAncestors(block, 7) { for _, ancestor := range self.chain.GetAncestors(block, 7) {
for _, uncle := range ancestor.Uncles() { for _, uncle := range ancestor.Uncles() {
current.family.Add(uncle.Hash()) current.family.Add(uncle.Hash())
} }
current.family.Add(ancestor.Hash()) current.family.Add(ancestor.Hash())
current.ancestors.Add(ancestor.Hash())
} }
accounts, _ := self.eth.AccountManager().Accounts() accounts, _ := self.eth.AccountManager().Accounts()
// Keep track of transactions which return errors so they can be removed // Keep track of transactions which return errors so they can be removed

Loading…
Cancel
Save