forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

clique/api: fix some minor review concerns

Browse source
This commit is contained in:
Martin Holst Swende 2019-10-02 10:36:56 +02:00
parent 177dc821ac
commit 4b2ae2a036
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
consensus/clique/api.go
View file

@ -120,7 +120,7 @@ func (api *API) Discard(address common.Address) {
delete(api.clique.proposals, address) delete(api.clique.proposals, address)
} }
type CliqueStatus struct { type Status struct {
InturnPercent float64 `json:"inturnPercent"` InturnPercent float64 `json:"inturnPercent"`
SigningStatus map[common.Address]int `json:"sealerActivity""` SigningStatus map[common.Address]int `json:"sealerActivity""`
NumBlocks uint64 `json:"numBlocks"` NumBlocks uint64 `json:"numBlocks"`
@ -130,7 +130,7 @@ type CliqueStatus struct {
// - the number of active signers, // - the number of active signers,
// - the number of signers, // - the number of signers,
// - the percentage of in-turn blocks // - the percentage of in-turn blocks
func (api *API) Status() (*CliqueStatus, error) { func (api *API) Status() (*Status, error) {
var ( var (
numBlocks = uint64(64) numBlocks = uint64(64)
header = api.chain.CurrentHeader() header = api.chain.CurrentHeader()
@ -156,21 +156,20 @@ func (api *API) Status() (*CliqueStatus, error) {
} }
for n := start; n < end; n++ { for n := start; n < end; n++ {
h := api.chain.GetHeaderByNumber(n) h := api.chain.GetHeaderByNumber(n)
if h != nil { if h == nil {
if h.Difficulty.Cmp(diffInTurn) == 0 {
optimals += 1
}
diff += h.Difficulty.Uint64()
if sealer, err := api.clique.Author(h); err != nil {
return nil, err
} else {
signStatus[sealer] += 1
}
} else {
return nil, fmt.Errorf("missing block %d", n) return nil, fmt.Errorf("missing block %d", n)
} }
if h.Difficulty.Cmp(diffInTurn) == 0 {
optimals++
}
diff += h.Difficulty.Uint64()
sealer, err := api.clique.Author(h)
if err != nil {
return nil, err
}
signStatus[sealer]++
} }
return &CliqueStatus{ return &Status{
InturnPercent: float64((100 * optimals)) / float64(numBlocks), InturnPercent: float64((100 * optimals)) / float64(numBlocks),
SigningStatus: signStatus, SigningStatus: signStatus,
NumBlocks: numBlocks, NumBlocks: numBlocks,