interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

eth, rpc, xeth: ext_hanhrate => eth_hashrate

This commit is contained in:
obscuren 2015-04-28 11:16:03 +02:00
parent 46f63ef04f
commit 459d898705
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eth/backend.go
View File

@ -343,7 +343,6 @@ func (s *Ethereum) Etherbase() (eb common.Address, err error) {
func (s *Ethereum) StopMining() { s.miner.Stop() } func (s *Ethereum) StopMining() { s.miner.Stop() }
func (s *Ethereum) IsMining() bool { return s.miner.Mining() } func (s *Ethereum) IsMining() bool { return s.miner.Mining() }
func (s *Ethereum) HashRate() int64 { return s.miner.HashRate() }
func (s *Ethereum) Miner() *miner.Miner { return s.miner } func (s *Ethereum) Miner() *miner.Miner { return s.miner }
// func (s *Ethereum) Logger() logger.LogSystem { return s.logger } // func (s *Ethereum) Logger() logger.LogSystem { return s.logger }

2
rpc/api.go
View File

@ -465,7 +465,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
return err return err
} }
*reply = api.xeth().Whisper().Messages(args.Id) *reply = api.xeth().Whisper().Messages(args.Id)
case "ext_hashrate": case "eth_hashrate":
*reply = newHexNum(api.xeth().HashRate()) *reply = newHexNum(api.xeth().HashRate())
// case "eth_register": // case "eth_register":

2
xeth/xeth.go
View File

@ -281,7 +281,7 @@ func (self *XEth) IsMining() bool {
} }
func (self *XEth) HashRate() int64 { func (self *XEth) HashRate() int64 {
return self.backend.HashRate() return self.backend.Miner().HashRate()
} }
func (self *XEth) EthVersion() string { func (self *XEth) EthVersion() string {