diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-12 07:26:40 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-12 07:26:40 +0800 |
| commit | 7ee5cb0a81f9ccc0efec2a5bf830c7566f3289ad (patch) | |
| tree | be71b38f179f61b1941771a0ecaa2555105acc24 /xeth | |
| parent | 70f6f2af07b3f3a4d848190525e50f3327acb2c7 (diff) | |
| parent | 9fb52c517beda2422920eb5b265a0f714d59c39a (diff) | |
| download | dexon-7ee5cb0a81f9ccc0efec2a5bf830c7566f3289ad.tar dexon-7ee5cb0a81f9ccc0efec2a5bf830c7566f3289ad.tar.gz dexon-7ee5cb0a81f9ccc0efec2a5bf830c7566f3289ad.tar.bz2 dexon-7ee5cb0a81f9ccc0efec2a5bf830c7566f3289ad.tar.lz dexon-7ee5cb0a81f9ccc0efec2a5bf830c7566f3289ad.tar.xz dexon-7ee5cb0a81f9ccc0efec2a5bf830c7566f3289ad.tar.zst dexon-7ee5cb0a81f9ccc0efec2a5bf830c7566f3289ad.zip | |
Merge branch 'develop' into rpcfrontier
Diffstat (limited to 'xeth')
| -rw-r--r-- | xeth/xeth.go | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/xeth/xeth.go b/xeth/xeth.go index d8dd66aec..70172a1c8 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -14,7 +14,6 @@ import ( "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/miner" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/whisper" @@ -35,7 +34,10 @@ type Backend interface { StateDb() ethutil.Database EventMux() *event.TypeMux Whisper() *whisper.Whisper - Miner() *miner.Miner + + IsMining() bool + StartMining() error + StopMining() } // Frontend should be implemented by users of XEth. Its methods are @@ -65,7 +67,6 @@ type XEth struct { accountManager *accounts.Manager state *State whisper *Whisper - miner *miner.Miner frontend Frontend } @@ -87,7 +88,6 @@ func New(eth Backend, frontend Frontend) *XEth { chainManager: eth.ChainManager(), accountManager: eth.AccountManager(), whisper: NewWhisper(eth.Whisper()), - miner: eth.Miner(), frontend: frontend, } if frontend == nil { @@ -104,7 +104,6 @@ func (self *XEth) WithState(statedb *state.StateDB) *XEth { blockProcessor: self.blockProcessor, chainManager: self.chainManager, whisper: self.whisper, - miner: self.miner, } xeth.state = NewState(xeth, statedb) @@ -112,8 +111,7 @@ func (self *XEth) WithState(statedb *state.StateDB) *XEth { } func (self *XEth) State() *State { return self.state } -func (self *XEth) Whisper() *Whisper { return self.whisper } -func (self *XEth) Miner() *miner.Miner { return self.miner } +func (self *XEth) Whisper() *Whisper { return self.whisper } func (self *XEth) BlockByHash(strHash string) *Block { hash := fromHex(strHash) @@ -172,18 +170,19 @@ func (self *XEth) PeerCount() int { } func (self *XEth) IsMining() bool { - return self.miner.Mining() + return self.eth.IsMining() } func (self *XEth) SetMining(shouldmine bool) bool { - ismining := self.miner.Mining() + ismining := self.eth.IsMining() if shouldmine && !ismining { - self.miner.Start() + err := self.eth.StartMining() + return err == nil } if ismining && !shouldmine { - self.miner.Stop() + self.eth.StopMining() } - return self.miner.Mining() + return self.eth.IsMining() } func (self *XEth) IsListening() bool { |