Skip to content

Commit 000fc4e

Browse files
gertjaapgertjaap
committed
Fix linting errors
1 parent edbf06c commit 000fc4e

File tree

18 files changed

+201
-77
lines changed

18 files changed

+201
-77
lines changed

‎backend/mining.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,10 @@ func (m *Backend) StopMining() bool {
220220
}
221221
logging.Infof("Stopping mining process...")
222222
for _, br := range m.minerBinaries {
223-
br.Stop()
223+
err := br.Stop()
224+
if err != nil {
225+
logging.Errorf("Error stopping miner: %s %v", br.MinerBinary.MainExecutableName, err)
226+
}
224227
}
225228
select {
226229
case m.stopBalance <- true:

‎backend/settings.go‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,14 @@ import (
1616

1717
func (m *Backend) getSetting(name string) bool {
1818
setting := "0"
19-
m.settings.View(func(tx *buntdb.Tx) error {
19+
err := m.settings.View(func(tx *buntdb.Tx) error {
2020
v, err := tx.Get(name)
2121
setting = v
2222
return err
2323
})
24+
if err != nil {
25+
logging.Errorf("Error in getSetting(%s): %v", name, err)
26+
}
2427
return setting == "1"
2528
}
2629

@@ -29,27 +32,36 @@ func (m *Backend) setSetting(name string, value bool) {
2932
if value {
3033
setting = "1"
3134
}
32-
m.settings.Update(func(tx *buntdb.Tx) error {
35+
err := m.settings.Update(func(tx *buntdb.Tx) error {
3336
_, _, err := tx.Set(name, setting, nil)
3437
return err
3538
})
39+
if err != nil {
40+
logging.Errorf("Error in setSetting(%s): %v", name, err)
41+
}
3642
}
3743

3844
func (m *Backend) setIntSetting(name string, value int) {
3945
setting := fmt.Sprintf("%d", value)
40-
m.settings.Update(func(tx *buntdb.Tx) error {
46+
err := m.settings.Update(func(tx *buntdb.Tx) error {
4147
_, _, err := tx.Set(name, setting, nil)
4248
return err
4349
})
50+
if err != nil {
51+
logging.Errorf("Error in setSetting(%s): %v", name, err)
52+
}
4453
}
4554

4655
func (m *Backend) getIntSetting(name string) int {
4756
setting := "0"
48-
m.settings.View(func(tx *buntdb.Tx) error {
57+
err := m.settings.View(func(tx *buntdb.Tx) error {
4958
v, err := tx.Get(name)
5059
setting = v
5160
return err
5261
})
62+
if err != nil {
63+
logging.Errorf("Error in getSetting(%s): %v", name, err)
64+
}
5365
i, _ := strconv.Atoi(setting)
5466
return i
5567
}

‎keyfile/keyfile.go‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ func CreateKeyFile(pass string) error {
2929

3030
// Create random key
3131
priv32 := new([32]byte)
32-
rand.Read(priv32[:])
32+
_, err := rand.Read(priv32[:])
33+
if err != nil {
34+
return err
35+
}
3336

3437
// Derive pubkey
3538
_, pub := btcec.PrivKeyFromBytes(btcec.S256(), priv32[:])
@@ -38,7 +41,7 @@ func CreateKeyFile(pass string) error {
3841
dk32 := new([32]byte) // derived key from scrypt
3942

4043
//get 24 random bytes for scrypt salt (and secretbox nonce)
41-
_, err := rand.Read(salt[:])
44+
_, err = rand.Read(salt[:])
4245
if err != nil {
4346
return err
4447
}
@@ -75,8 +78,8 @@ func loadPublicKey() []byte {
7578
}
7679

7780
func GetPublicKey() []byte {
78-
pub := loadPublicKey()
79-
return pub
81+
pub := loadPublicKey()
82+
return pub
8083
}
8184

8285
func GetAddress() string {
@@ -116,7 +119,7 @@ func LoadPrivateKey(password string) ([]byte, error) {
116119

117120
// nonce for secretbox is the same as scrypt salt. Seems fine. Really.
118121
priv, worked := secretbox.Open(nil, enckey[24:], salt, dk32)
119-
if worked != true {
122+
if !worked {
120123
return []byte{}, fmt.Errorf("Decryption failed for %s ", filename)
121124
}
122125

@@ -129,6 +132,5 @@ func TestPassword(password string) bool {
129132
return false
130133
}
131134
_, pub := btcec.PrivKeyFromBytes(btcec.S256(), priv)
132-
priv = nil
133135
return bytes.Equal(loadPublicKey(), pub.SerializeCompressed())
134136
}

‎main.go‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,11 @@ func main() {
5656
logging.SetLogLevel(int(logging.LogLevelDebug))
5757
if _, err := os.Stat(util.DataDirectory()); os.IsNotExist(err) {
5858
logging.Infof("Creating data directory")
59-
os.MkdirAll(util.DataDirectory(), 0700)
59+
err = os.MkdirAll(util.DataDirectory(), 0700)
60+
if err != nil && !os.IsExist(err) {
61+
logging.Errorf("Error creating data directory, cannot continue")
62+
os.Exit(1)
63+
}
6064
}
6165

6266
logFilePath := filepath.Join(util.DataDirectory(), "debug.log")
@@ -80,7 +84,12 @@ func main() {
8084
if err := s.CheckLock(); err != nil && err == single.ErrAlreadyRunning {
8185
alreadyRunning = true
8286
} else if err == nil {
83-
defer s.TryUnlock()
87+
defer func() {
88+
err := s.TryUnlock()
89+
if err != nil {
90+
logging.Errorf("Error unlocking OCM: %v", err)
91+
}
92+
}()
8493
}
8594

8695
backend, err := backend.NewBackend(alreadyRunning)
@@ -93,7 +102,10 @@ func main() {
93102

94103
backend.ResetPool()
95104
app.Bind(backend)
96-
app.Run()
105+
err = app.Run()
106+
if err != nil {
107+
logging.Errorf("Error running app: %v", err)
108+
}
97109
backend.StopMining()
98110

99111
tracking.Track(tracking.TrackingRequest{

‎miners/ccminer.go‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,14 @@ func (l *CCMinerImpl) ConstructCommandlineArgs(args BinaryArguments) []string {
8787
}
8888

8989
func (l *CCMinerImpl) AvailableGPUs() int8 {
90-
l.binaryRunner.launch([]string{"-n"}, false)
91-
l.binaryRunner.cmd.Wait()
90+
err := l.binaryRunner.launch([]string{"-n"}, false)
91+
if err != nil {
92+
return 0
93+
}
94+
err = l.binaryRunner.cmd.Wait()
95+
if err != nil {
96+
return 0
97+
}
9298
// Output is caught by ParseOuput function above and this will set the gpuCount accordingly
9399
return l.gpuCount
94100
}

‎miners/cryptodredge.go‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,15 @@ func (l *CryptoDredgeMinerImpl) ConstructCommandlineArgs(args BinaryArguments) [
8989
}
9090

9191
func (l *CryptoDredgeMinerImpl) AvailableGPUs() int8 {
92-
l.binaryRunner.launch([]string{}, false)
92+
err := l.binaryRunner.launch([]string{}, false)
93+
if err != nil {
94+
return 0
95+
}
9396
time.Sleep(time.Second)
94-
l.binaryRunner.Stop()
97+
err = l.binaryRunner.Stop()
98+
if err != nil {
99+
return 0
100+
}
95101
// Output is caught by ParseOuput function above and this will set the gpuCount accordingly
96102
return l.gpuCount
97103
}

‎miners/lyclminer.go‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,16 @@ func (l *LyclMinerImpl) Configure(args BinaryArguments) error {
5050

5151
os.Remove(filepath.Join(util.DataDirectory(), "lyclMiner.conf"))
5252
out, err := os.Create(filepath.Join(util.DataDirectory(), "lyclMiner.conf"))
53-
defer out.Close()
53+
if err != nil {
54+
logging.Error(err)
55+
return err
56+
}
57+
defer func() {
58+
err := out.Close()
59+
if err != nil {
60+
logging.Error(err)
61+
}
62+
}()
5463

5564
scanner := bufio.NewScanner(in)
5665
skip := false
@@ -60,11 +69,17 @@ func (l *LyclMinerImpl) Configure(args BinaryArguments) error {
6069
skip = false
6170
}
6271
if strings.HasPrefix(line, "<Connection") {
63-
out.WriteString(fmt.Sprintf("<Connection Url = \"%s\"\n\tUsername = \"%s\"\n\tPassword = \"%s\"\n\tAlgorithm = \"Lyra2REv3\">\n\n", args.StratumUrl, args.StratumUsername, args.StratumPassword))
72+
_, err = out.WriteString(fmt.Sprintf("<Connection Url = \"%s\"\n\tUsername = \"%s\"\n\tPassword = \"%s\"\n\tAlgorithm = \"Lyra2REv3\">\n\n", args.StratumUrl, args.StratumUsername, args.StratumPassword))
73+
if err != nil {
74+
return err
75+
}
6476
skip = true
6577
}
6678
if !skip {
67-
out.WriteString(fmt.Sprintf("%s\n", line))
79+
_, err = out.WriteString(fmt.Sprintf("%s\n", line))
80+
if err != nil {
81+
return err
82+
}
6883
}
6984
}
7085
if err := scanner.Err(); err != nil {

‎miners/miners.go‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ type MinerBinary struct {
3535

3636
func GetMinerBinaries() []MinerBinary {
3737
binaries := []MinerBinary{}
38-
util.GetJson("https://raw.githubusercontent.com/vertcoin-project/one-click-miner-vnext/master/miners.json", &binaries)
38+
err := util.GetJson("https://raw.githubusercontent.com/vertcoin-project/one-click-miner-vnext/master/miners.json", &binaries)
39+
if err != nil {
40+
logging.Errorf("Error fetching miner binaries: %v", err)
41+
return binaries
42+
}
3943
for i := range binaries {
4044
if binaries[i].GpuPlatformString == "AMD" {
4145
binaries[i].GPUType = util.GPUTypeAMD
@@ -177,7 +181,7 @@ const (
177181
func (b *BinaryRunner) CheckRunning() RunningState {
178182
if !b.IsRunning() {
179183
logging.Infof("Miner [%s] stopped running.", b.MinerBinary.MainExecutableName)
180-
if time.Now().Sub(b.lastStarted).Seconds() < 10 {
184+
if time.Since(b.lastStarted).Seconds() < 10 {
181185
// Rapid fail
182186
b.rapidFails++
183187
if b.rapidFails > 3 {
@@ -187,7 +191,10 @@ func (b *BinaryRunner) CheckRunning() RunningState {
187191
}
188192

189193
logging.Infof("Restarting miner [%s]", b.MinerBinary.MainExecutableName)
190-
b.restart()
194+
err := b.restart()
195+
if err != nil {
196+
logging.Errorf("Error restarting miner: %v", err)
197+
}
191198
return RunningStateRestarting
192199
}
193200
return RunningStateRunning
@@ -266,7 +273,10 @@ func (b *BinaryRunner) launch(params []string, wait bool) error {
266273
if wait {
267274
b.running = true
268275
go func() {
269-
b.cmd.Wait()
276+
err := b.cmd.Wait()
277+
if err != nil {
278+
logging.Errorf("Error in miner: %v", err)
279+
}
270280
b.running = false
271281
}()
272282
}
@@ -304,7 +314,7 @@ func (b *BinaryRunner) unpack() error {
304314

305315
func (b *BinaryRunner) findExecutable() string {
306316
mainExecutablePath := ""
307-
filepath.Walk(b.unpackDir(),
317+
err := filepath.Walk(b.unpackDir(),
308318
func(path string, info os.FileInfo, err error) error {
309319
if err != nil {
310320
return err
@@ -314,6 +324,9 @@ func (b *BinaryRunner) findExecutable() string {
314324
}
315325
return nil
316326
})
327+
if err != nil {
328+
logging.Errorf("Error finding executable: %v", err)
329+
}
317330
return mainExecutablePath
318331
}
319332

@@ -325,7 +338,10 @@ func (b *BinaryRunner) ensureAvailable() error {
325338
if os.IsNotExist(err) {
326339
logging.Debugf("%sBinary not found, downloading...", b.logPrefix())
327340
freshDownload = true
328-
b.download()
341+
err := b.download()
342+
if err != nil {
343+
return err
344+
}
329345
} else if err != nil {
330346
return err
331347
} else {

‎miners/teamredminer.go‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,14 @@ func (l *TeamRedMinerImpl) ConstructCommandlineArgs(args BinaryArguments) []stri
8686
}
8787

8888
func (l *TeamRedMinerImpl) AvailableGPUs() int8 {
89-
l.binaryRunner.launch([]string{"--list_devices"}, false)
90-
l.binaryRunner.cmd.Wait()
89+
err := l.binaryRunner.launch([]string{"--list_devices"}, false)
90+
if err != nil {
91+
return 0
92+
}
93+
err = l.binaryRunner.cmd.Wait()
94+
if err != nil {
95+
return 0
96+
}
9197
// Output is caught by ParseOuput function above and this will set the gpuCount accordingly
9298
return l.gpuCount
9399
}

‎miners/verthashminer.go‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,16 @@ func (l *VerthashMinerImpl) Configure(args BinaryArguments) error {
6464

6565
os.Remove(filepath.Join(util.DataDirectory(), "verthash-miner.conf"))
6666
out, err := os.Create(filepath.Join(util.DataDirectory(), "verthash-miner.conf"))
67-
defer out.Close()
67+
if err != nil {
68+
logging.Error(err)
69+
return err
70+
}
71+
defer func() {
72+
err := out.Close()
73+
if err != nil {
74+
logging.Error(err)
75+
}
76+
}()
6877

6978
var parsedDevices map[int]util.VerthashMinerDeviceConfig
7079

@@ -79,11 +88,17 @@ func (l *VerthashMinerImpl) Configure(args BinaryArguments) error {
7988
skip = false
8089
}
8190
if strings.HasPrefix(line, "<Connection") {
82-
out.WriteString(fmt.Sprintf("<Connection Url = \"%s\"\n\tUsername = \"%s\"\n\tPassword = \"%s\"\n\tAlgorithm = \"Verthash\">\n\n", args.StratumUrl, args.StratumUsername, args.StratumPassword))
91+
_, err = out.WriteString(fmt.Sprintf("<Connection Url = \"%s\"\n\tUsername = \"%s\"\n\tPassword = \"%s\"\n\tAlgorithm = \"Verthash\">\n\n", args.StratumUrl, args.StratumUsername, args.StratumPassword))
92+
if err != nil {
93+
return err
94+
}
8395
skip = true
8496
}
8597
if strings.HasPrefix(line, "<Global") {
86-
out.WriteString(fmt.Sprintf("<Global Debug=\"false\" VerthashDataFileVerification=\"false\" VerthashDataFile=\"%s\">\n\n", filepath.Join(util.DataDirectory(), "verthash.dat")))
98+
_, err = out.WriteString(fmt.Sprintf("<Global Debug=\"false\" VerthashDataFileVerification=\"false\" VerthashDataFile=\"%s\">\n\n", filepath.Join(util.DataDirectory(), "verthash.dat")))
99+
if err != nil {
100+
return err
101+
}
87102
skip = true
88103
}
89104

@@ -115,7 +130,10 @@ func (l *VerthashMinerImpl) Configure(args BinaryArguments) error {
115130
}
116131

117132
if !skip {
118-
out.WriteString(fmt.Sprintf("%s\n", line))
133+
_, err = out.WriteString(fmt.Sprintf("%s\n", line))
134+
if err != nil {
135+
return err
136+
}
119137
}
120138
}
121139
if err := scanner.Err(); err != nil {

0 commit comments

Comments
 (0)