diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-06 01:13:35 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-06 02:58:43 +0800 |
| commit | ac695387075fdd9214ef8de71ac6897136a50ce8 (patch) | |
| tree | 5a4bce7c79eebe56b3573892e30e96b1ed0936fd /miner/miner.go | |
| parent | 9d2166a964d83c09481dea6ef30889f260249295 (diff) | |
| parent | db7c34a9df19d5a8a3a02a5e3d4cafcffa18dcb8 (diff) | |
| download | dexon-ac695387075fdd9214ef8de71ac6897136a50ce8.tar dexon-ac695387075fdd9214ef8de71ac6897136a50ce8.tar.gz dexon-ac695387075fdd9214ef8de71ac6897136a50ce8.tar.bz2 dexon-ac695387075fdd9214ef8de71ac6897136a50ce8.tar.lz dexon-ac695387075fdd9214ef8de71ac6897136a50ce8.tar.xz dexon-ac695387075fdd9214ef8de71ac6897136a50ce8.tar.zst dexon-ac695387075fdd9214ef8de71ac6897136a50ce8.zip | |
Merge branch 'develop' into miner
Diffstat (limited to 'miner/miner.go')
| -rw-r--r-- | miner/miner.go | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/miner/miner.go b/miner/miner.go index 8044ef073..79ba68587 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -205,9 +205,7 @@ func (self *Miner) mine() { block.Header().Extra = self.Extra // Apply uncles - if len(self.uncles) > 0 { - block.SetUncles(self.uncles) - } + block.SetUncles(self.uncles) parent := chainMan.GetBlock(block.ParentHash()) coinbase := state.GetOrNewStateObject(block.Coinbase()) @@ -234,10 +232,10 @@ func (self *Miner) mine() { minerlogger.Infof("Mining on block. Includes %v transactions", len(transactions)) - x, y := getSeed(chainMan, block) - self.pow, err = ethash.New(append(x, y...), block) + x, _ := getSeed(chainMan, block) + self.pow, err = ethash.New(x, block) if err != nil { - fmt.Println("err", err) + fmt.Println("miner gave back err", err) return } |