all: address gosimple linter errors

mfycheng · mfycheng · commit f89114a80fa8 · 2024-04-13T15:00:41.000-04:00
diff --git a/.golangci-lint.yaml b/.golangci-lint.yaml
@@ -6,6 +6,7 @@ linters:
     - errcheck
     - ineffassign
     - govet
+    - gosimple
 
 issues:
   exclude-rules:
diff --git a/pkg/code/async/account/service.go b/pkg/code/async/account/service.go
@@ -42,8 +42,6 @@ func (p *service) Start(ctx context.Context, interval time.Duration) error {
 		}
 	}()
 
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	}
+	<-ctx.Done()
+	return ctx.Err()
 }
diff --git a/pkg/code/async/commitment/service.go b/pkg/code/async/commitment/service.go
@@ -49,8 +49,6 @@ func (p *service) Start(ctx context.Context, interval time.Duration) error {
 		}
 	}()
 
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	}
+	<-ctx.Done()
+	return ctx.Err()
 }
diff --git a/pkg/code/async/geyser/service.go b/pkg/code/async/geyser/service.go
@@ -111,9 +111,7 @@ func (p *service) Start(ctx context.Context, _ time.Duration) error {
 	}()
 
 	// Wait for the service to stop
-	select {
-	case <-ctx.Done():
-	}
+	<-ctx.Done()
 
 	// Gracefully shutdown
 	close(p.programUpdatesChan)
diff --git a/pkg/code/async/sequencer/service.go b/pkg/code/async/sequencer/service.go
@@ -74,8 +74,6 @@ func (p *service) Start(ctx context.Context, interval time.Duration) error {
 		}
 	}()
 
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	}
+	<-ctx.Done()
+	return ctx.Err()
 }
diff --git a/pkg/code/async/treasury/service.go b/pkg/code/async/treasury/service.go
@@ -51,8 +51,6 @@ func (p *service) Start(ctx context.Context, interval time.Duration) error {
 		}
 	}()
 
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	}
+	<-ctx.Done()
+	return ctx.Err()
 }
diff --git a/pkg/code/async/user/service.go b/pkg/code/async/user/service.go
@@ -47,8 +47,6 @@ func (p *service) Start(ctx context.Context, interval time.Duration) error {
 		}
 	}()
 
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	}
+	<-ctx.Done()
+	return ctx.Err()
 }
diff --git a/pkg/code/async/webhook/service.go b/pkg/code/async/webhook/service.go
@@ -50,8 +50,6 @@ func (p *service) Start(ctx context.Context, interval time.Duration) error {
 		}
 	}()
 
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	}
+	<-ctx.Done()
+	return ctx.Err()
 }
diff --git a/pkg/code/data/transaction/memory/store.go b/pkg/code/data/transaction/memory/store.go
@@ -5,8 +5,8 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/code-payments/code-server/pkg/database/query"
 	"github.com/code-payments/code-server/pkg/code/data/transaction"
+	"github.com/code-payments/code-server/pkg/database/query"
 )
 
 type store struct {
@@ -45,8 +45,7 @@ func (s *store) Put(ctx context.Context, data *transaction.Record) error {
 	defer s.transactionStoreMu.Unlock()
 	s.lastIndex++
 
-	var clone transaction.Record
-	clone = *data
+	clone := *data
 
 	for index, item := range s.transactionStore {
 		if item.Signature == data.Signature {
diff --git a/pkg/code/server/grpc/currency/currency.go b/pkg/code/server/grpc/currency/currency.go
@@ -41,7 +41,7 @@ func (s *currencyServer) GetAllRates(ctx context.Context, req *currencypb.GetAll
 	var record *currency.MultiRateRecord
 	if req.Timestamp != nil && req.Timestamp.AsTime().Before(time.Now().Add(-15*time.Minute)) {
 		record, err = s.LoadExchangeRatesForTime(ctx, req.Timestamp.AsTime())
-	} else if req.Timestamp == nil || req.Timestamp.AsTime().Sub(time.Now()) < time.Hour {
+	} else if req.Timestamp == nil || time.Until(req.Timestamp.AsTime()) < time.Hour {
 		record, err = s.LoadExchangeRatesLatest(ctx)
 	} else {
 		return nil, status.Error(codes.InvalidArgument, "timestamp too far in the future")
diff --git a/pkg/config/wrapper/wrappers.go b/pkg/config/wrapper/wrappers.go
@@ -437,10 +437,10 @@ func (c *DurationConfig) GetSafe(ctx context.Context) (time.Duration, error) {
 	} else if err != nil {
 		return lastValue, err
 	}
-	switch override.(type) {
+	switch override := override.(type) {
 	case []byte:
 		var newValue time.Duration
-		strValue := string(override.([]byte))
+		strValue := string(override)
 
 		newValue, err = time.ParseDuration(strValue)
 		if err != nil {
@@ -451,7 +451,7 @@ func (c *DurationConfig) GetSafe(ctx context.Context) (time.Duration, error) {
 		c.stateMu.Unlock()
 		return newValue, nil
 	case time.Duration:
-		newValue := override.(time.Duration)
+		newValue := override
 		c.stateMu.Lock()
 		c.lastValue = newValue
 		c.stateMu.Unlock()
diff --git a/pkg/grpc/util.go b/pkg/grpc/util.go
@@ -13,7 +13,7 @@ import (
 
 var (
 	healthCheckEndpoint = "/grpc.health.v1.Health/Check"
-	fullMethodNameRegex = regexp.MustCompile("/([a-zA-Z0-9]+\\.)+[a-zA-Z0-9]+/[a-zA-Z0-9]+")
+	fullMethodNameRegex = regexp.MustCompile(`/([a-zA-Z0-9]+\.)+[a-zA-Z0-9]+/[a-zA-Z0-9]+`)
 )
 
 // ParseFullMethodName parses a gRPC full method name into its components
diff --git a/pkg/phone/validation.go b/pkg/phone/validation.go
@@ -4,7 +4,7 @@ import "regexp"
 
 var (
 	// E.164 phone number format regex provided by Twilio: https://www.twilio.com/docs/glossary/what-e164#regex-matching-for-e164
-	phonePattern = regexp.MustCompile("^\\+[1-9]\\d{1,14}$")
+	phonePattern = regexp.MustCompile(`^\+[1-9]\d{1,14}$`)
 
 	// A verification code must be a 4-10 digit string
 	verificationCodePattern = regexp.MustCompile("^[0-9]{4,10}$")
diff --git a/pkg/sync/striped_channel_test.go b/pkg/sync/striped_channel_test.go
@@ -22,15 +22,8 @@ func TestStripedChannel_HappyPath(t *testing.T) {
 			wg.Done()
 		}()
 
-		for {
-			select {
-			case val, ok := <-c:
-				if !ok {
-					return
-				}
-
-				results[id][val.(int)]++
-			}
+		for val := range c {
+			results[id][val.(int)]++
 		}
 	}
 
diff --git a/pkg/sync/striped_lock_test.go b/pkg/sync/striped_lock_test.go
@@ -16,7 +16,7 @@ func TestStripedLock_HappyPath(t *testing.T) {
 	l := NewStripedLock(4)
 
 	var workerWg base.WaitGroup
-	startChan := make(chan struct{}, 0)
+	startChan := make(chan struct{})
 	data := make([]int, workerCount)
 
 	for i := 0; i < workerCount; i++ {
@@ -33,9 +33,7 @@ func TestStripedLock_HappyPath(t *testing.T) {
 				go func() {
 					defer opWg.Done()
 
-					select {
-					case <-startChan:
-					}
+					<-startChan
 
 					mu := l.Get([]byte(key))
 					mu.Lock()

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,6 @@ func (p *service) Start(ctx context.Context, interval time.Duration) error {`
`42`	`42`	`}`
`43`	`43`	`}()`
`44`	`44`
`45`		`- select {`
`46`		`- case <-ctx.Done():`
`47`		`- return ctx.Err()`
`48`		`- }`
	`45`	`+ <-ctx.Done()`
	`46`	`+ return ctx.Err()`
`49`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,6 @@ func (p *service) Start(ctx context.Context, interval time.Duration) error {`
`49`	`49`	`}`
`50`	`50`	`}()`
`51`	`51`
`52`		`- select {`
`53`		`- case <-ctx.Done():`
`54`		`- return ctx.Err()`
`55`		`- }`
	`52`	`+ <-ctx.Done()`
	`53`	`+ return ctx.Err()`
`56`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,6 @@ func (p *service) Start(ctx context.Context, interval time.Duration) error {`
`74`	`74`	`}`
`75`	`75`	`}()`
`76`	`76`
`77`		`- select {`
`78`		`- case <-ctx.Done():`
`79`		`- return ctx.Err()`
`80`		`- }`
	`77`	`+ <-ctx.Done()`
	`78`	`+ return ctx.Err()`
`81`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,6 @@ func (p *service) Start(ctx context.Context, interval time.Duration) error {`
`51`	`51`	`}`
`52`	`52`	`}()`
`53`	`53`
`54`		`- select {`
`55`		`- case <-ctx.Done():`
`56`		`- return ctx.Err()`
`57`		`- }`
	`54`	`+ <-ctx.Done()`
	`55`	`+ return ctx.Err()`
`58`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,6 @@ func (p *service) Start(ctx context.Context, interval time.Duration) error {`
`47`	`47`	`}`
`48`	`48`	`}()`
`49`	`49`
`50`		`- select {`
`51`		`- case <-ctx.Done():`
`52`		`- return ctx.Err()`
`53`		`- }`
	`50`	`+ <-ctx.Done()`
	`51`	`+ return ctx.Err()`
`54`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,6 @@ func (p *service) Start(ctx context.Context, interval time.Duration) error {`
`50`	`50`	`}`
`51`	`51`	`}()`
`52`	`52`
`53`		`- select {`
`54`		`- case <-ctx.Done():`
`55`		`- return ctx.Err()`
`56`		`- }`
	`53`	`+ <-ctx.Done()`
	`54`	`+ return ctx.Err()`
`57`	`55`	`}`