diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-03-12 06:56:48 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-03-12 06:56:48 +0800 |
| commit | 6af078bd8c9451f9c12cab371bf7bd2569f575a3 (patch) | |
| tree | 08d6b802539aadd66fdd27236847de1f966318d2 /xeth | |
| parent | 5a9f712144058c576d14b0d27ff2d2d270cd6d27 (diff) | |
| parent | d5aaf413e0307b07597e48a548f0219f4ea8c3be (diff) | |
| download | go-tangerine-6af078bd8c9451f9c12cab371bf7bd2569f575a3.tar go-tangerine-6af078bd8c9451f9c12cab371bf7bd2569f575a3.tar.gz go-tangerine-6af078bd8c9451f9c12cab371bf7bd2569f575a3.tar.bz2 go-tangerine-6af078bd8c9451f9c12cab371bf7bd2569f575a3.tar.lz go-tangerine-6af078bd8c9451f9c12cab371bf7bd2569f575a3.tar.xz go-tangerine-6af078bd8c9451f9c12cab371bf7bd2569f575a3.tar.zst go-tangerine-6af078bd8c9451f9c12cab371bf7bd2569f575a3.zip | |
Merge pull request #462 from fjl/miner-coinbase
miner: provide coinbase when starting the miner
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 { |