From 459d8987050e85fcae23d169453fc4d7f185eefc Mon Sep 17 00:00:00 2001 From: obscuren Date: Tue, 28 Apr 2015 11:16:03 +0200 Subject: [PATCH] eth, rpc, xeth: ext_hanhrate => eth_hashrate --- eth/backend.go | 1 - rpc/api.go | 2 +- xeth/xeth.go | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/eth/backend.go b/eth/backend.go index fa83491163..783f339088 100644 --- 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 } diff --git a/rpc/api.go b/rpc/api.go index 9fbe2c5650..6f7a814744 100644 --- 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": diff --git a/xeth/xeth.go b/xeth/xeth.go index 71c39fd429..710fec5c5b 100644 --- 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 {