X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=mining%2Fminingpool%2Fminingpool.go;fp=mining%2Fminingpool%2Fminepool.go;h=83e11ee19e261b91ffbe068bfe34509163ce18c1;hb=2d5fb161e87426f7ce9158c51b1eac1d5a5f12c2;hp=742269cc5b00d2f29c8a9680c1e92ceb0630ea83;hpb=989269c3a708aa8ff421646ce7e588eafa3d8b13;p=bytom%2Fbytom.git diff --git a/mining/miningpool/minepool.go b/mining/miningpool/miningpool.go similarity index 95% rename from mining/miningpool/minepool.go rename to mining/miningpool/miningpool.go index 742269cc..83e11ee1 100644 --- a/mining/miningpool/minepool.go +++ b/mining/miningpool/miningpool.go @@ -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 }