Skip to content

Commit 3393ca9

Browse files
x1unixx1unix
committed
Use number for Ghs5s
1 parent a31fa12 commit 3393ca9

File tree

3 files changed

+55
-52
lines changed

3 files changed

+55
-52
lines changed

‎cgminer_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ func TestStats(t *testing.T) {
357357
Wait: 0.0,
358358
Max: 0.0,
359359
Min: 99999999.0,
360-
Ghs5s: "13630.55",
360+
Ghs5s: Number(13630.55),
361361
GhsAverage: 13569.28,
362362
MinerCount: 3,
363363
Frequency: 637,
@@ -563,7 +563,7 @@ func TestStats2BoardsS9(t *testing.T) {
563563
Wait: 0.0,
564564
Max: 0.0,
565565
Min: 99999999.0,
566-
Ghs5s: "9074.024",
566+
Ghs5s: Number(9074.024),
567567
GhsAverage: 13590.24,
568568
MinerCount: 3,
569569
Frequency: 637,

‎number.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ func (n Number) Int64() int64 {
3333

3434
// Int returns the number as an int.
3535
func (n Number) Int() int {
36+
if n == 0 {
37+
return 0
38+
}
3639
return int(math.Round(float64(n)))
3740
}
3841

‎types.go

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -172,56 +172,56 @@ type GenericStats struct {
172172
Temp4_3 int16 `json:"temp4_3"`
173173
Temp4_4 int16 `json:"temp4_4"`
174174
// interfcace{} - because S7 has valid value, but all others have quoted value
175-
Ghs5s interface{} `json:"GHS 5s"`
176-
GhsAverage float64 `json:"GHS av"`
177-
ChainHW1 int `json:"chain_hw1"`
178-
ChainHW2 int `json:"chain_hw2"`
179-
ChainHW3 int `json:"chain_hw3"`
180-
ChainHW4 int `json:"chain_hw4"`
181-
ChainHW5 int `json:"chain_hw5"`
182-
ChainHW6 int `json:"chain_hw6"`
183-
ChainHW7 int `json:"chain_hw7"`
184-
ChainHW8 int `json:"chain_hw8"`
185-
ChainHW9 int `json:"chain_hw9"`
186-
ChainHW10 int `json:"chain_hw10"`
187-
ChainHW11 int `json:"chain_hw11"`
188-
ChainHW12 int `json:"chain_hw12"`
189-
ChainHW13 int `json:"chain_hw13"`
190-
ChainHW14 int `json:"chain_hw14"`
191-
ChainHW15 int `json:"chain_hw15"`
192-
ChainHW16 int `json:"chain_hw16"`
193-
ChainAcs1 string `json:"chain_acs1"`
194-
ChainAcs2 string `json:"chain_acs2"`
195-
ChainAcs3 string `json:"chain_acs3"`
196-
ChainAcs4 string `json:"chain_acs4"`
197-
ChainAcs5 string `json:"chain_acs5"`
198-
ChainAcs6 string `json:"chain_acs6"`
199-
ChainAcs7 string `json:"chain_acs7"`
200-
ChainAcs8 string `json:"chain_acs8"`
201-
ChainAcs9 string `json:"chain_acs9"`
202-
ChainAcs10 string `json:"chain_acs10"`
203-
ChainAcs11 string `json:"chain_acs11"`
204-
ChainAcs12 string `json:"chain_acs12"`
205-
ChainAcs13 string `json:"chain_acs13"`
206-
ChainAcs14 string `json:"chain_acs14"`
207-
ChainAcs15 string `json:"chain_acs15"`
208-
ChainAcs16 string `json:"chain_acs16"`
209-
ChainAcn1 int `json:"chain_acn1"`
210-
ChainAcn2 int `json:"chain_acn2"`
211-
ChainAcn3 int `json:"chain_acn3"`
212-
ChainAcn4 int `json:"chain_acn4"`
213-
ChainAcn5 int `json:"chain_acn5"`
214-
ChainAcn6 int `json:"chain_acn6"`
215-
ChainAcn7 int `json:"chain_acn7"`
216-
ChainAcn8 int `json:"chain_acn8"`
217-
ChainAcn9 int `json:"chain_acn9"`
218-
ChainAcn10 int `json:"chain_acn10"`
219-
ChainAcn11 int `json:"chain_acn11"`
220-
ChainAcn12 int `json:"chain_acn12"`
221-
ChainAcn13 int `json:"chain_acn13"`
222-
ChainAcn14 int `json:"chain_acn14"`
223-
ChainAcn15 int `json:"chain_acn15"`
224-
ChainAcn16 int `json:"chain_acn16"`
175+
Ghs5s Number `json:"GHS 5s"`
176+
GhsAverage float64 `json:"GHS av"`
177+
ChainHW1 int `json:"chain_hw1"`
178+
ChainHW2 int `json:"chain_hw2"`
179+
ChainHW3 int `json:"chain_hw3"`
180+
ChainHW4 int `json:"chain_hw4"`
181+
ChainHW5 int `json:"chain_hw5"`
182+
ChainHW6 int `json:"chain_hw6"`
183+
ChainHW7 int `json:"chain_hw7"`
184+
ChainHW8 int `json:"chain_hw8"`
185+
ChainHW9 int `json:"chain_hw9"`
186+
ChainHW10 int `json:"chain_hw10"`
187+
ChainHW11 int `json:"chain_hw11"`
188+
ChainHW12 int `json:"chain_hw12"`
189+
ChainHW13 int `json:"chain_hw13"`
190+
ChainHW14 int `json:"chain_hw14"`
191+
ChainHW15 int `json:"chain_hw15"`
192+
ChainHW16 int `json:"chain_hw16"`
193+
ChainAcs1 string `json:"chain_acs1"`
194+
ChainAcs2 string `json:"chain_acs2"`
195+
ChainAcs3 string `json:"chain_acs3"`
196+
ChainAcs4 string `json:"chain_acs4"`
197+
ChainAcs5 string `json:"chain_acs5"`
198+
ChainAcs6 string `json:"chain_acs6"`
199+
ChainAcs7 string `json:"chain_acs7"`
200+
ChainAcs8 string `json:"chain_acs8"`
201+
ChainAcs9 string `json:"chain_acs9"`
202+
ChainAcs10 string `json:"chain_acs10"`
203+
ChainAcs11 string `json:"chain_acs11"`
204+
ChainAcs12 string `json:"chain_acs12"`
205+
ChainAcs13 string `json:"chain_acs13"`
206+
ChainAcs14 string `json:"chain_acs14"`
207+
ChainAcs15 string `json:"chain_acs15"`
208+
ChainAcs16 string `json:"chain_acs16"`
209+
ChainAcn1 int `json:"chain_acn1"`
210+
ChainAcn2 int `json:"chain_acn2"`
211+
ChainAcn3 int `json:"chain_acn3"`
212+
ChainAcn4 int `json:"chain_acn4"`
213+
ChainAcn5 int `json:"chain_acn5"`
214+
ChainAcn6 int `json:"chain_acn6"`
215+
ChainAcn7 int `json:"chain_acn7"`
216+
ChainAcn8 int `json:"chain_acn8"`
217+
ChainAcn9 int `json:"chain_acn9"`
218+
ChainAcn10 int `json:"chain_acn10"`
219+
ChainAcn11 int `json:"chain_acn11"`
220+
ChainAcn12 int `json:"chain_acn12"`
221+
ChainAcn13 int `json:"chain_acn13"`
222+
ChainAcn14 int `json:"chain_acn14"`
223+
ChainAcn15 int `json:"chain_acn15"`
224+
ChainAcn16 int `json:"chain_acn16"`
225225
// Number because we cannot parse empty string "" to float
226226
// S9(), D3() and other interface methods will correct represent this value as float32
227227
ChainRate1 Number `json:"chain_rate1"`

0 commit comments

Comments
 (0)