diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-23 19:12:53 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-23 19:12:53 +0800 |
| commit | 6657d544db4eefec24ebd280940048f25ed85186 (patch) | |
| tree | a65998614ecb147e0e67107aa34ac306d027ccc1 /xeth/xeth.go | |
| parent | 0be6d3404898a8e68f2f78cfa6b64d6b1f314fb0 (diff) | |
| parent | dbb2af6016c952b0f49d552a10fc59af0a9f7ce7 (diff) | |
| download | go-tangerine-6657d544db4eefec24ebd280940048f25ed85186.tar go-tangerine-6657d544db4eefec24ebd280940048f25ed85186.tar.gz go-tangerine-6657d544db4eefec24ebd280940048f25ed85186.tar.bz2 go-tangerine-6657d544db4eefec24ebd280940048f25ed85186.tar.lz go-tangerine-6657d544db4eefec24ebd280940048f25ed85186.tar.xz go-tangerine-6657d544db4eefec24ebd280940048f25ed85186.tar.zst go-tangerine-6657d544db4eefec24ebd280940048f25ed85186.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'xeth/xeth.go')
| -rw-r--r-- | xeth/xeth.go | 6 |
1 files changed, 3 insertions, 3 deletions
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() |