diff options
Diffstat (limited to 'miner')
| -rw-r--r-- | miner/agent.go | 7 | ||||
| -rw-r--r-- | miner/miner.go | 1 | ||||
| -rw-r--r-- | miner/worker.go | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/miner/agent.go b/miner/agent.go index 5b2bfdb06..6c21d8015 100644 --- a/miner/agent.go +++ b/miner/agent.go @@ -42,11 +42,16 @@ func (self *CpuMiner) Start() { } func (self *CpuMiner) update() { + justStarted := true out: for { select { case block := <-self.c: - self.quitCurrentOp <- struct{}{} + if justStarted { + justStarted = true + } else { + self.quitCurrentOp <- struct{}{} + } go self.mine(block) case <-self.quit: diff --git a/miner/miner.go b/miner/miner.go index b60422a3a..b95c65859 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -29,6 +29,7 @@ func New(coinbase []byte, eth core.Backend, pow pow.PoW, minerThreads int) *Mine pow: pow, } + minerThreads = 1 for i := 0; i < minerThreads; i++ { miner.worker.register(NewCpuMiner(i, miner.pow)) } diff --git a/miner/worker.go b/miner/worker.go index 774ef9a7e..012353fa1 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -151,10 +151,10 @@ func (self *worker) wait() { self.current.block.Header().Nonce = work.Nonce self.current.block.Header().MixDigest = work.MixDigest self.current.block.Header().SeedHash = work.SeedHash - fmt.Println(self.current.block) if err := self.chain.InsertChain(types.Blocks{self.current.block}); err == nil { self.mux.Post(core.NewMinedBlockEvent{self.current.block}) + fmt.Println("GOOD BLOCK", self.current.block) } else { self.commitNewWork() } |