Merge pull request #201 from Bytom/v0.1

[bytom/vapor.git] / mining / miningpool / miningpool.go

diff --git a/mining/miningpool/miningpool.go b/mining/miningpool/miningpool.go
deleted file mode 100644 (file)
index eecec59..0000000
--- a/mining/miningpool/miningpool.go
+++ /dev/null
@@ -1,118 +0,0 @@
-package miningpool
-
-import (
-       "errors"
-       "sync"
-       "time"
-
-       log "github.com/sirupsen/logrus"
-
-       "github.com/vapor/account"
-       "github.com/vapor/protocol"
-       "github.com/vapor/protocol/bc"
-       "github.com/vapor/protocol/bc/types"
-)
-
-const (
-       maxSubmitChSize = 50
-)
-
-type submitBlockMsg struct {
-       blockHeader *types.BlockHeader
-       reply       chan error
-}
-
-// MiningPool is the support struct for p2p mine pool
-type MiningPool struct {
-       mutex    sync.RWMutex
-       block    *types.Block
-       submitCh chan *submitBlockMsg
-
-       chain          *protocol.Chain
-       accountManager *account.Manager
-       txPool         *protocol.TxPool
-       newBlockCh     chan *bc.Hash
-}
-
-// NewMiningPool will create a new MiningPool
-func NewMiningPool(c *protocol.Chain, accountManager *account.Manager, txPool *protocol.TxPool, newBlockCh chan *bc.Hash) *MiningPool {
-       m := &MiningPool{
-               submitCh:       make(chan *submitBlockMsg, maxSubmitChSize),
-               chain:          c,
-               accountManager: accountManager,
-               txPool:         txPool,
-               newBlockCh:     newBlockCh,
-       }
-       m.generateBlock()
-       go m.blockUpdater()
-       return m
-}
-
-// blockUpdater is the goroutine for keep update mining block
-func (m *MiningPool) blockUpdater() {
-       for {
-               select {
-               case <-m.chain.BlockWaiter(m.chain.BestBlockHeight() + 1):
-                       m.generateBlock()
-
-               case submitMsg := <-m.submitCh:
-                       err := m.submitWork(submitMsg.blockHeader)
-                       if err == nil {
-                               m.generateBlock()
-                       }
-                       submitMsg.reply <- err
-               }
-       }
-}
-
-// generateBlock generates a block template to mine
-func (m *MiningPool) generateBlock() {
-
-}
-
-// GetWork will return a block header for p2p mining
-func (m *MiningPool) GetWork() (*types.BlockHeader, error) {
-       if m.block != nil {
-               m.mutex.RLock()
-               defer m.mutex.RUnlock()
-
-               m.block.BlockHeader.Timestamp = uint64(time.Now().Unix())
-               bh := m.block.BlockHeader
-               return &bh, nil
-       }
-       return nil, errors.New("no block is ready for mining")
-}
-
-// SubmitWork will try to submit the result to the blockchain
-func (m *MiningPool) SubmitWork(bh *types.BlockHeader) error {
-       reply := make(chan error, 1)
-       m.submitCh <- &submitBlockMsg{blockHeader: bh, reply: reply}
-       err := <-reply
-       if err != nil {
-               log.WithFields(log.Fields{"err": err, "height": bh.Height}).Warning("submitWork failed")
-       }
-       return err
-}
-
-func (m *MiningPool) submitWork(bh *types.BlockHeader) error {
-       m.mutex.Lock()
-       defer m.mutex.Unlock()
-
-       if m.block == nil || bh.PreviousBlockHash != m.block.PreviousBlockHash {
-               return errors.New("pending mining block has been changed")
-       }
-
-       //m.block.Nonce = bh.Nonce
-       m.block.Timestamp = bh.Timestamp
-       isOrphan, err := m.chain.ProcessBlock(m.block)
-       if err != nil {
-               return err
-       }
-       if isOrphan {
-               return errors.New("submit result is orphan")
-       }
-
-       blockHash := bh.Hash()
-       m.newBlockCh <- &blockHash
-       return nil
-}