diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-28 17:16:03 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-28 17:16:03 +0800 |
| commit | 459d8987050e85fcae23d169453fc4d7f185eefc (patch) | |
| tree | 89a6632020c96d1908bbd57ee0df1fb99b2eeee2 | |
| parent | 46f63ef04f326a9c792c4f9f055e90100a3528f7 (diff) | |
| download | go-tangerine-459d8987050e85fcae23d169453fc4d7f185eefc.tar go-tangerine-459d8987050e85fcae23d169453fc4d7f185eefc.tar.gz go-tangerine-459d8987050e85fcae23d169453fc4d7f185eefc.tar.bz2 go-tangerine-459d8987050e85fcae23d169453fc4d7f185eefc.tar.lz go-tangerine-459d8987050e85fcae23d169453fc4d7f185eefc.tar.xz go-tangerine-459d8987050e85fcae23d169453fc4d7f185eefc.tar.zst go-tangerine-459d8987050e85fcae23d169453fc4d7f185eefc.zip | |
eth, rpc, xeth: ext_hanhrate => eth_hashrate
| -rw-r--r-- | eth/backend.go | 1 | ||||
| -rw-r--r-- | rpc/api.go | 2 | ||||
| -rw-r--r-- | xeth/xeth.go | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/eth/backend.go b/eth/backend.go index fa8349116..783f33908 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 9fbe2c565..6f7a81474 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 71c39fd42..710fec5c5 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 { |