OSDN Git Service

clean miningpool (#1265)
authorHAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
Wed, 22 Aug 2018 07:55:14 +0000 (15:55 +0800)
committerPaladz <yzhu101@uottawa.ca>
Wed, 22 Aug 2018 07:55:14 +0000 (15:55 +0800)
* :zap: Improve miningpool blockUpdater()

* :fire: Clean up

* Rename minepool.go to miningpool.go

* :art: No need to change timestamp

* :fire: clean import

mining/miningpool/miningpool.go [moved from mining/miningpool/minepool.go with 95% similarity]

similarity index 95%
rename from mining/miningpool/minepool.go
rename to mining/miningpool/miningpool.go
index 742269c..83e11ee 100644 (file)
@@ -3,7 +3,6 @@ package miningpool
 import (
        "errors"
        "sync"
-       "time"
 
        log "github.com/sirupsen/logrus"
 
@@ -70,17 +69,12 @@ func (m *MiningPool) blockUpdater() {
 func (m *MiningPool) generateBlock() {
        m.mutex.Lock()
        defer m.mutex.Unlock()
-       if m.block != nil && *m.chain.BestBlockHash() == m.block.PreviousBlockHash {
-               m.block.Timestamp = uint64(time.Now().Unix())
-               return
-       }
 
        block, err := mining.NewBlockTemplate(m.chain, m.txPool, m.accountManager)
        if err != nil {
                log.Errorf("miningpool: failed on create NewBlockTemplate: %v", err)
                return
        }
-
        m.block = block
 }