Rename Agent to RemoteAgent

This commit is contained in:
Taylor Gerring 2015-03-23 11:14:42 +01:00
parent 01c0ba22ae
commit 439481d177
2 changed files with 14 additions and 14 deletions

View File

@ -7,7 +7,7 @@ import (
"github.com/ethereum/go-ethereum/miner" "github.com/ethereum/go-ethereum/miner"
) )
type Agent struct { type RemoteAgent struct {
work *types.Block work *types.Block
currentWork *types.Block currentWork *types.Block
@ -16,34 +16,34 @@ type Agent struct {
returnCh chan<- miner.Work returnCh chan<- miner.Work
} }
func NewAgent() *Agent { func NewRemoteAgent() *RemoteAgent {
agent := &Agent{} agent := &RemoteAgent{}
go agent.run() go agent.run()
return agent return agent
} }
func (a *Agent) Work() chan<- *types.Block { func (a *RemoteAgent) Work() chan<- *types.Block {
return a.workCh return a.workCh
} }
func (a *Agent) SetWorkCh(returnCh chan<- miner.Work) { func (a *RemoteAgent) SetWorkCh(returnCh chan<- miner.Work) {
a.returnCh = returnCh a.returnCh = returnCh
} }
func (a *Agent) Start() { func (a *RemoteAgent) Start() {
a.quit = make(chan struct{}) a.quit = make(chan struct{})
a.workCh = make(chan *types.Block, 1) a.workCh = make(chan *types.Block, 1)
} }
func (a *Agent) Stop() { func (a *RemoteAgent) Stop() {
close(a.quit) close(a.quit)
close(a.workCh) close(a.workCh)
} }
func (a *Agent) GetHashRate() int64 { return 0 } func (a *RemoteAgent) GetHashRate() int64 { return 0 }
func (a *Agent) run() { func (a *RemoteAgent) run() {
out: out:
for { for {
select { select {
@ -55,7 +55,7 @@ out:
} }
} }
func (a *Agent) GetWork() [3]string { func (a *RemoteAgent) GetWork() [3]string {
var res [3]string var res [3]string
// XXX Wait here until work != nil ? // XXX Wait here until work != nil ?
@ -69,7 +69,7 @@ func (a *Agent) GetWork() [3]string {
return res return res
} }
func (a *Agent) SubmitWork(nonce uint64, mixDigest, seedHash common.Hash) bool { func (a *RemoteAgent) SubmitWork(nonce uint64, mixDigest, seedHash common.Hash) bool {
// Return true or false, but does not indicate if the PoW was correct // Return true or false, but does not indicate if the PoW was correct
// Make sure the external miner was working on the right hash // Make sure the external miner was working on the right hash

View File

@ -102,7 +102,7 @@ type XEth struct {
// register map[string][]*interface{} // TODO improve return type // register map[string][]*interface{} // TODO improve return type
// Miner agent // Miner agent
agent *Agent agent *RemoteAgent
} }
// New creates an XEth that uses the given frontend. // New creates an XEth that uses the given frontend.
@ -120,7 +120,7 @@ func New(eth Backend, frontend Frontend) *XEth {
frontend: frontend, frontend: frontend,
logs: make(map[int]*logFilter), logs: make(map[int]*logFilter),
messages: make(map[int]*whisperFilter), messages: make(map[int]*whisperFilter),
agent: NewAgent(), agent: NewRemoteAgent(),
} }
eth.Miner().Register(xeth.agent) eth.Miner().Register(xeth.agent)
@ -170,7 +170,7 @@ func (self *XEth) stop() {
func (self *XEth) DefaultGas() *big.Int { return defaultGas } func (self *XEth) DefaultGas() *big.Int { return defaultGas }
func (self *XEth) DefaultGasPrice() *big.Int { return defaultGasPrice } func (self *XEth) DefaultGasPrice() *big.Int { return defaultGasPrice }
func (self *XEth) RemoteMining() *Agent { return self.agent } func (self *XEth) RemoteMining() *RemoteAgent { return self.agent }
func (self *XEth) AtStateNum(num int64) *XEth { func (self *XEth) AtStateNum(num int64) *XEth {
chain := self.Backend().ChainManager() chain := self.Backend().ChainManager()