status-im
/
op-geth
mirror of https://github.com/status-im/op-geth.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22604 from karalabe/hashrate-capitalization-fix 

all: fix miner hashRate -> hashrate on API calls
This commit is contained in:
Péter Szilágyi 2021-03-31 19:27:23 +03:00 committed by GitHub
parent 4a37ae510e 55300d4fdb
commit 73ed68988f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
consensus/ethash/api.go
View File

@ -89,7 +89,7 @@ func (api *API) SubmitWork(nonce types.BlockNonce, hash, digest common.Hash) boo
// //
// It accepts the miner hash rate and an identifier which must be unique // It accepts the miner hash rate and an identifier which must be unique
// between nodes. // between nodes.
func (api *API) SubmitHashRate(rate hexutil.Uint64, id common.Hash) bool { func (api *API) SubmitHashrate(rate hexutil.Uint64, id common.Hash) bool {
if api.ethash.remote == nil { if api.ethash.remote == nil {
return false return false
} }

6
consensus/ethash/ethash_test.go
View File

@ -135,7 +135,7 @@ func TestRemoteSealer(t *testing.T) {
} }
} }
func TestHashRate(t *testing.T) { func TestHashrate(t *testing.T) {
var ( var (
hashrate = []hexutil.Uint64{100, 200, 300} hashrate = []hexutil.Uint64{100, 200, 300}
expect uint64 expect uint64
@ -150,7 +150,7 @@ func TestHashRate(t *testing.T) {
api := &API{ethash} api := &API{ethash}
for i := 0; i < len(hashrate); i += 1 { for i := 0; i < len(hashrate); i += 1 {
if res := api.SubmitHashRate(hashrate[i], ids[i]); !res { if res := api.SubmitHashrate(hashrate[i], ids[i]); !res {
t.Error("remote miner submit hashrate failed") t.Error("remote miner submit hashrate failed")
} }
expect += uint64(hashrate[i]) expect += uint64(hashrate[i])
@ -170,7 +170,7 @@ func TestClosedRemoteSealer(t *testing.T) {
t.Error("expect to return an error to indicate ethash is stopped") t.Error("expect to return an error to indicate ethash is stopped")
} }
if res := api.SubmitHashRate(hexutil.Uint64(100), common.HexToHash("a")); res { if res := api.SubmitHashrate(hexutil.Uint64(100), common.HexToHash("a")); res {
t.Error("expect to return false when submit hashrate to a stopped ethash") t.Error("expect to return false when submit hashrate to a stopped ethash")
} }
} }

10
eth/api.go
View File

@ -61,11 +61,6 @@ func (api *PublicEthereumAPI) Coinbase() (common.Address, error) {
return api.Etherbase() return api.Etherbase()
} }
// Hashrate returns the POW hashrate
func (api *PublicEthereumAPI) Hashrate() hexutil.Uint64 {
return hexutil.Uint64(api.e.Miner().HashRate())
}
// ChainId is the EIP-155 replay-protection chain id for the current ethereum chain config. // ChainId is the EIP-155 replay-protection chain id for the current ethereum chain config.
func (api *PublicEthereumAPI) ChainId() (hexutil.Uint64, error) { func (api *PublicEthereumAPI) ChainId() (hexutil.Uint64, error) {
// if current block is at or past the EIP-155 replay-protection fork block, return chainID from config // if current block is at or past the EIP-155 replay-protection fork block, return chainID from config
@ -149,11 +144,6 @@ func (api *PrivateMinerAPI) SetRecommitInterval(interval int) {
api.e.Miner().SetRecommitInterval(time.Duration(interval) * time.Millisecond) api.e.Miner().SetRecommitInterval(time.Duration(interval) * time.Millisecond)
} }
// GetHashrate returns the current hashrate of the miner.
func (api *PrivateMinerAPI) GetHashrate() uint64 {
return api.e.miner.HashRate()
}
// PrivateAdminAPI is the collection of Ethereum full node-related APIs // PrivateAdminAPI is the collection of Ethereum full node-related APIs
// exposed over the private admin endpoint. // exposed over the private admin endpoint.
type PrivateAdminAPI struct { type PrivateAdminAPI struct {

2
ethstats/ethstats.go
View File

@ -754,7 +754,7 @@ func (s *Service) reportStats(conn *connWrapper) error {
fullBackend, ok := s.backend.(fullNodeBackend) fullBackend, ok := s.backend.(fullNodeBackend)
if ok { if ok {
mining = fullBackend.Miner().Mining() mining = fullBackend.Miner().Mining()
hashrate = int(fullBackend.Miner().HashRate()) hashrate = int(fullBackend.Miner().Hashrate())
sync := fullBackend.Downloader().Progress() sync := fullBackend.Downloader().Progress()
syncing = fullBackend.CurrentHeader().Number.Uint64() >= sync.HighestBlock syncing = fullBackend.CurrentHeader().Number.Uint64() >= sync.HighestBlock

4
internal/web3ext/web3ext.go
View File

@ -138,8 +138,8 @@ web3._extend({
params: 3, params: 3,
}), }),
new web3._extend.Method({ new web3._extend.Method({
name: 'submitHashRate', name: 'submitHashrate',
call: 'ethash_submitHashRate', call: 'ethash_submitHashrate',
params: 2, params: 2,
}), }),
] ]

2
miner/miner.go
View File

@ -160,7 +160,7 @@ func (miner *Miner) Mining() bool {
return miner.worker.isRunning() return miner.worker.isRunning()
} }
func (miner *Miner) HashRate() uint64 { func (miner *Miner) Hashrate() uint64 {
if pow, ok := miner.engine.(consensus.PoW); ok { if pow, ok := miner.engine.(consensus.PoW); ok {
return uint64(pow.Hashrate()) return uint64(pow.Hashrate())
} }