eth, rpc, xeth: ext_hanhrate => eth_hashrate

10 years ago · 459d898705
parent 46f63ef04f
commit 459d898705
3 changed files with 2 additions and 3 deletions
--- a/eth/backend.go
+++ b/eth/backend.go
@ -343,7 +343,6 @@ func (s *Ethereum) Etherbase() (eb common.Address, err error) {

 func (s *Ethereum) StopMining()         { s.miner.Stop() }
 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) Logger() logger.LogSystem             { return s.logger }
--- a/rpc/api.go
+++ b/rpc/api.go
@ -465,7 +465,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
 			return err
 		}
 		*reply = api.xeth().Whisper().Messages(args.Id)
-	case "ext_hashrate":
+	case "eth_hashrate":
 		*reply = newHexNum(api.xeth().HashRate())

 	// case "eth_register":
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@ -281,7 +281,7 @@ func (self *XEth) IsMining() bool {
 }

 func (self *XEth) HashRate() int64 {
-	return self.backend.HashRate()
+	return self.backend.Miner().HashRate()
 }

 func (self *XEth) EthVersion() string {