P2Pool/consensus
P2Pool/consensus
1
1
Fork 0
Code Issues 3 Pull requests Releases Activity

Use ZeroDifficulty instead of empty struct

Browse source
This commit is contained in:
DataHoarder 2022-12-12 17:38:50 +01:00
parent ff607bd67a
commit 165ce38d6e
Signed by: DataHoarder
SSH key fingerprint: SHA256:OLTRf6Fl87G52SiR7sWLGNzlJt4WOX+tfI2yxo0z7xk
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/web/web.go
View file

@ -647,7 +647,7 @@ func main() {
miner := share["miner"].(string)
if _, ok := miners[miner]; !ok {
miners[miner] = make(map[string]any)
miners[miner]["weight"] = types.Difficulty{}
miners[miner]["weight"] = types.ZeroDifficulty
miners[miner]["shares"] = NewPositionChart(size, p2pool.PPLNSWindow*windowCount)
miners[miner]["uncles"] = NewPositionChart(size, p2pool.PPLNSWindow*windowCount)
if a, ok := share["miner_alias"]; ok {
@ -668,7 +668,7 @@ func main() {
miner := uncle["miner"].(string)
if _, ok := miners[miner]; !ok {
miners[miner] = make(map[string]any)
miners[miner]["weight"] = types.Difficulty{}
miners[miner]["weight"] = types.ZeroDifficulty
miners[miner]["shares"] = NewPositionChart(size, p2pool.PPLNSWindow*windowCount)
miners[miner]["uncles"] = NewPositionChart(size, p2pool.PPLNSWindow*windowCount)
if a, ok := uncle["miner_alias"]; ok {

4
types/difficulty.go
View file

@ -190,10 +190,10 @@ func (d Difficulty) MarshalJSON() ([]byte, error) {
func DifficultyFromString(s string) (Difficulty, error) {
if buf, err := hex.DecodeString(s); err != nil {
return Difficulty{}, err
return ZeroDifficulty, err
} else {
if len(buf) != DifficultySize {
return Difficulty{}, errors.New("wrong hash size")
return ZeroDifficulty, errors.New("wrong hash size")
}
return DifficultyFromBytes(buf), nil