Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

2 files changed, 3 insertions, 84 deletions

diff --git a/xeth/miner_agent.go b/xeth/miner_agent.go
deleted file mode 100644
index 181ab950a..000000000
--- a/xeth/miner_agent.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package xeth
-
-import (
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/miner"
-)
-
-type Agent struct {
-	work        *types.Block
-	currentWork *types.Block
-
-	quit     chan struct{}
-	workCh   chan *types.Block
-	returnCh chan<- miner.Work
-}
-
-func NewAgent() *Agent {
-	agent := &Agent{}
-	go agent.run()
-
-	return agent
-}
-
-func (a *Agent) Work() chan<- *types.Block {
-	return a.workCh
-}
-
-func (a *Agent) SetWorkCh(returnCh chan<- miner.Work) {
-	a.returnCh = returnCh
-}
-
-func (a *Agent) Start() {
-	a.quit = make(chan struct{})
-	a.workCh = make(chan *types.Block, 1)
-}
-
-func (a *Agent) Stop() {
-	close(a.quit)
-	close(a.workCh)
-}
-
-func (a *Agent) GetHashRate() int64 { return 0 }
-
-func (a *Agent) run() {
-out:
-	for {
-		select {
-		case <-a.quit:
-			break out
-		case work := <-a.workCh:
-			a.work = work
-		}
-	}
-}
-
-func (a *Agent) GetWork() [3]string {
-	// TODO return HashNoNonce, DAGSeedHash, Difficulty
-	var res [3]string
-
-	// XXX Wait here untill work != nil ?.
-	if a.work != nil {
-		res[0] = a.work.HashNoNonce().Hex() // Header Hash No Nonce
-		res[1] = common.Hash{}.Hex()        // DAG Seed
-		res[2] = common.Hash{}.Hex()        // Difficulty
-	}
-
-	return res
-}
-
-func (a *Agent) SubmitWork(nonce uint64, mixDigest, seedHash common.Hash) bool {
-	// Return true or false, but does not indicate if the PoW was correct
-
-	// Make sure the external miner was working on the right hash
-	if a.currentWork != nil && a.work != nil && a.currentWork.Hash() == a.work.Hash() {
-		a.returnCh <- miner.Work{a.currentWork.Number().Uint64(), nonce, mixDigest.Bytes(), seedHash.Bytes()}
-		return true
-	}
-
-	return false
-}
diff --git a/xeth/xeth.go b/xeth/xeth.go
index fba61230f..23e523980 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -102,7 +102,7 @@ type XEth struct {
 	// register map[string][]*interface{} // TODO improve return type
 
 	// Miner agent
-	agent *Agent
+	agent *miner.RemoteAgent
 }
 
 // New creates an XEth that uses the given frontend.
@@ -120,7 +120,7 @@ func New(eth Backend, frontend Frontend) *XEth {
 		frontend:       frontend,
 		logs:           make(map[int]*logFilter),
 		messages:       make(map[int]*whisperFilter),
-		agent:          NewAgent(),
+		agent:          miner.NewRemoteAgent(),
 	}
 	eth.Miner().Register(xeth.agent)
 
@@ -170,7 +170,7 @@ func (self *XEth) stop() {
 func (self *XEth) DefaultGas() *big.Int      { return defaultGas }
 func (self *XEth) DefaultGasPrice() *big.Int { return defaultGasPrice }
 
-func (self *XEth) RemoteMining() *Agent { return self.agent }
+func (self *XEth) RemoteMining() *miner.RemoteAgent { return self.agent }
 
 func (self *XEth) AtStateNum(num int64) *XEth {
 	chain := self.Backend().ChainManager()