all: fix default linters

mfycheng · mfycheng · commit ac2babf72ecb · 2024-04-13T15:49:11.000-04:00
diff --git a/.golangci-lint.yaml b/.golangci-lint.yaml
@@ -1,17 +1,6 @@
-run:
-
-linters:
-  disable-all: true
-  enable:
-    - errcheck
-    - ineffassign
-    - govet
-    - gosimple
-    - staticcheck
-
 issues:
   exclude-rules:
     - path: '(.+)_test\.go'
       text: ".*GetPaymentHistory is deprecated: Payment history has migrated to chats"
     - path: '(.+)testutil\.go'
-      text: ".*GetPaymentHistory is deprecated: Payment history has migrated to chats"
+      text: ".*GetPaymentHistory is deprecated: Payment history has migrated to chats"
diff --git a/pkg/code/async/account/config.go b/pkg/code/async/account/config.go
@@ -3,7 +3,7 @@ package async_account
 // todo: setup configs
 
 const (
-	envConfigPrefix = "ACCOUNT_SERVICE_"
+	envConfigPrefix = "ACCOUNT_SERVICE_" //nolint:unused
 )
 
 type conf struct {
diff --git a/pkg/code/async/geyser/handler_test.go b/pkg/code/async/geyser/handler_test.go
@@ -16,12 +16,12 @@ func TestTimelockV1ProgramAccountHandler(t *testing.T) {
 
 }
 
-type testEnv struct {
+type testEnv struct { //nolint:unused
 	data     code_data.Provider
 	handlers map[string]ProgramAccountUpdateHandler
 }
 
-func setup(t *testing.T) *testEnv {
+func setup(t *testing.T) *testEnv { //nolint:unused
 	data := code_data.NewTestDataProvider()
 	return &testEnv{
 		data:     data,
diff --git a/pkg/code/async/geyser/retry.go b/pkg/code/async/geyser/retry.go
@@ -2,18 +2,12 @@ package async_geyser
 
 import (
 	"context"
-	"errors"
 	"time"
 
 	"github.com/code-payments/code-server/pkg/retry"
 	"github.com/code-payments/code-server/pkg/retry/backoff"
 )
 
-var (
-	errSignatureNotConfirmed = errors.New("signature is not confirmed")
-	errSignatureNotFinalized = errors.New("signature is not finalized")
-)
-
 var waitForFinalizationRetryStrategies = []retry.Strategy{
 	retry.NonRetriableErrors(context.Canceled),
 	retry.Limit(30),
diff --git a/pkg/code/data/account/memory/store.go b/pkg/code/data/account/memory/store.go
@@ -404,7 +404,7 @@ func (s *store) CountRequiringAutoReturnCheck(ctx context.Context) (uint64, erro
 	return uint64(len(items)), nil
 }
 
-func cloneRecords(items []*account.Record) []*account.Record {
+func cloneRecords(items []*account.Record) []*account.Record { //nolint:unused
 	res := make([]*account.Record, len(items))
 
 	for i, item := range items {
diff --git a/pkg/code/data/action/memory/store.go b/pkg/code/data/action/memory/store.go
@@ -7,9 +7,9 @@ import (
 	"sync"
 	"time"
 
+	"github.com/code-payments/code-server/pkg/code/data/action"
 	"github.com/code-payments/code-server/pkg/database/query"
 	"github.com/code-payments/code-server/pkg/pointer"
-	"github.com/code-payments/code-server/pkg/code/data/action"
 )
 
 type ById []*action.Record
@@ -90,7 +90,7 @@ func (s *store) findBySource(source string) []*action.Record {
 	return res
 }
 
-func (s *store) filter(items []*action.Record, cursor query.Cursor, limit uint64, direction query.Ordering) []*action.Record {
+func (s *store) filter(items []*action.Record, cursor query.Cursor, limit uint64, direction query.Ordering) []*action.Record { //nolint:unused
 	var start uint64
 
 	start = 0
diff --git a/pkg/code/data/chat/memory/store.go b/pkg/code/data/chat/memory/store.go
@@ -7,8 +7,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/code-payments/code-server/pkg/database/query"
 	"github.com/code-payments/code-server/pkg/code/data/chat"
+	"github.com/code-payments/code-server/pkg/database/query"
 )
 
 type ChatsById []*chat.Chat
@@ -413,7 +413,7 @@ func (s *store) filterPagedMessagesByChat(items []*chat.Message, cursor query.Cu
 	return res, nil
 }
 
-func (s *store) sumContentLengths(items []*chat.Message) uint32 {
+func (s *store) sumContentLengths(items []*chat.Message) uint32 { //nolint:unused
 	var res uint32
 	for _, item := range items {
 		res += uint32(item.ContentLength)
diff --git a/pkg/code/data/currency/memory/store.go b/pkg/code/data/currency/memory/store.go
@@ -6,8 +6,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/code-payments/code-server/pkg/database/query"
 	"github.com/code-payments/code-server/pkg/code/data/currency"
+	"github.com/code-payments/code-server/pkg/database/query"
 )
 
 const (
@@ -36,7 +36,7 @@ func New() currency.Store {
 	}
 }
 
-func (s *store) reset() {
+func (s *store) reset() { //nolint:unused
 	s.currencyStoreMu.Lock()
 	s.currencyStore = make([]*currency.ExchangeRateRecord, 0)
 	s.currencyStoreMu.Unlock()
diff --git a/pkg/code/data/fulfillment/memory/store.go b/pkg/code/data/fulfillment/memory/store.go
@@ -7,9 +7,9 @@ import (
 	"sync"
 	"time"
 
+	"github.com/code-payments/code-server/pkg/code/data/fulfillment"
 	"github.com/code-payments/code-server/pkg/database/query"
 	"github.com/code-payments/code-server/pkg/pointer"
-	"github.com/code-payments/code-server/pkg/code/data/fulfillment"
 )
 
 type store struct {
@@ -120,7 +120,7 @@ func (s *store) findByStateAndAddress(state fulfillment.State, address string) [
 	return res
 }
 
-func (s *store) findByStateAndAddressAsSource(state fulfillment.State, address string) []*fulfillment.Record {
+func (s *store) findByStateAndAddressAsSource(state fulfillment.State, address string) []*fulfillment.Record { //nolint:unused
 	res := make([]*fulfillment.Record, 0)
 	for _, item := range s.records {
 		if item.State != state {
diff --git a/pkg/code/data/intent/memory/store.go b/pkg/code/data/intent/memory/store.go
@@ -6,8 +6,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/code-payments/code-server/pkg/database/query"
 	"github.com/code-payments/code-server/pkg/code/data/intent"
+	"github.com/code-payments/code-server/pkg/database/query"
 )
 
 type store struct {
@@ -63,7 +63,7 @@ func (s *store) findIntent(intentID string) *intent.Record {
 	return nil
 }
 
-func (s *store) findByState(state intent.State) []*intent.Record {
+func (s *store) findByState(state intent.State) []*intent.Record { //nolint:unused
 	res := make([]*intent.Record, 0)
 	for _, item := range s.records {
 		if item.State == state {
diff --git a/pkg/code/data/vault/tests/tests.go b/pkg/code/data/vault/tests/tests.go
@@ -16,6 +16,7 @@ func RunTests(t *testing.T, s vault.Store, teardown func()) {
 		testRoundTrip,
 		testUpdate,
 		testGetAllByState,
+		testGetCount,
 	} {
 		tf(t, s)
 		teardown()
diff --git a/pkg/code/push/data.go b/pkg/code/push/data.go
@@ -18,62 +18,6 @@ const (
 	chatMessageDataPush dataPushType = "ChatMessage"
 )
 
-// sendRawDataPushNotificationToOwner is a generic utility for sending raw data push
-// notification to the devices linked to an owner account.
-//
-// todo: Duplicated code with other send push utitilies
-func sendRawDataPushNotificationToOwner(
-	ctx context.Context,
-	data code_data.Provider,
-	pusher push_lib.Provider,
-	owner *common.Account,
-	notificationType dataPushType,
-	kvs map[string]string,
-) error {
-	log := logrus.StandardLogger().WithFields(logrus.Fields{
-		"method": "sendRawDataPushNotificationToOwner",
-		"owner":  owner.PublicKey().ToBase58(),
-	})
-
-	kvs[dataPushTypeKey] = string(notificationType)
-
-	pushTokenRecords, err := getPushTokensForOwner(ctx, data, owner)
-	if err != nil {
-		log.WithError(err).Warn("failure getting push tokens for owner")
-		return err
-	}
-
-	seenPushTokens := make(map[string]struct{})
-	for _, pushTokenRecord := range pushTokenRecords {
-		// Dedup push tokens, since they may appear more than once per app install
-		if _, ok := seenPushTokens[pushTokenRecord.PushToken]; ok {
-			continue
-		}
-
-		log := log.WithField("push_token", pushTokenRecord.PushToken)
-
-		// Try push
-		err := pusher.SendDataPush(
-			ctx,
-			pushTokenRecord.PushToken,
-			kvs,
-		)
-
-		if err != nil {
-			isValid, onPushErr := onPushError(ctx, data, pusher, pushTokenRecord)
-			log.WithError(err).
-				WithFields(logrus.Fields{
-					"on_push_error": onPushErr,
-					"is_valid":      isValid,
-				}).
-				Warn("failure sending push notification")
-		}
-
-		seenPushTokens[pushTokenRecord.PushToken] = struct{}{}
-	}
-	return nil
-}
-
 // sendMutableNotificationToOwner is a generic utility for sending mutable
 // push notification to the devices linked to an owner account. It's a
 // special data push where the notification content is replaced by the contents
diff --git a/pkg/code/server/grpc/account/server.go b/pkg/code/server/grpc/account/server.go
@@ -22,7 +22,6 @@ import (
 	"github.com/code-payments/code-server/pkg/code/data/action"
 	"github.com/code-payments/code-server/pkg/code/data/intent"
 	"github.com/code-payments/code-server/pkg/grpc/client"
-	"github.com/code-payments/code-server/pkg/kin"
 	timelock_token_v1 "github.com/code-payments/code-server/pkg/solana/timelock/v1"
 )
 
@@ -581,7 +580,3 @@ func (s *server) getOriginalGiftCardExchangeData(ctx context.Context, records *c
 		Quarks:       intentRecord.SendPrivatePaymentMetadata.Quantity,
 	}, nil
 }
-
-func hideDust(quarks uint64) uint64 {
-	return kin.ToQuarks(kin.FromQuarks(quarks))
-}
diff --git a/pkg/code/server/grpc/transaction/v2/errors.go b/pkg/code/server/grpc/transaction/v2/errors.go
@@ -77,10 +77,6 @@ func newIntentDeniedError(message string) IntentDeniedError {
 	}
 }
 
-func newIntentDeniedErrorf(format string, args ...any) IntentDeniedError {
-	return newIntentDeniedError(fmt.Sprintf(format, args...))
-}
-
 func (e IntentDeniedError) Error() string {
 	return e.message
 }
@@ -113,10 +109,6 @@ func newSwapDeniedError(message string) SwapDeniedError {
 	}
 }
 
-func newSwapDeniedErrorf(format string, args ...any) SwapDeniedError {
-	return newSwapDeniedError(fmt.Sprintf(format, args...))
-}
-
 func (e SwapDeniedError) Error() string {
 	return e.message
 }
diff --git a/pkg/code/server/grpc/transaction/v2/testutil.go b/pkg/code/server/grpc/transaction/v2/testutil.go
@@ -1093,28 +1093,17 @@ func (s *serverTestEnv) setupAirdropper(t *testing.T, initialFunds uint64) *comm
 	return owner
 }
 
-func (s *serverTestEnv) assertAirdroppedFirstKin(t *testing.T, phone phoneTestEnv) {
+func (s serverTestEnv) assertAirdroppedFirstKin(t *testing.T, phone phoneTestEnv) {
 	airdropIntentId := GetNewAirdropIntentId(AirdropTypeGetFirstKin, phone.parentAccount.PublicKey().ToBase58())
 	s.assertAirdropped(t, phone, AirdropTypeGetFirstKin, airdropIntentId, 1.0)
 }
 
-func (s *serverTestEnv) assertNotAirdroppedFirstKin(t *testing.T, phone phoneTestEnv) {
+func (s serverTestEnv) assertNotAirdroppedFirstKin(t *testing.T, phone phoneTestEnv) {
 	airdropIntentId := GetNewAirdropIntentId(AirdropTypeGetFirstKin, phone.parentAccount.PublicKey().ToBase58())
 	_, err := s.data.GetIntent(s.ctx, airdropIntentId)
 	assert.Equal(t, intent.ErrIntentNotFound, err)
 }
 
-func (s *serverTestEnv) assertAirdroppedForGivingFirstKin(t *testing.T, phone phoneTestEnv, intentId string) {
-	airdropIntentId := GetNewAirdropIntentId(AirdropTypeGiveFirstKin, intentId)
-	s.assertAirdropped(t, phone, AirdropTypeGiveFirstKin, airdropIntentId, 5.0)
-}
-
-func (s *serverTestEnv) assertNotAirdroppedForGivingFirstKin(t *testing.T, intentId string) {
-	airdropIntentId := GetNewAirdropIntentId(AirdropTypeGiveFirstKin, intentId)
-	_, err := s.data.GetIntent(s.ctx, airdropIntentId)
-	assert.Equal(t, intent.ErrIntentNotFound, err)
-}
-
 func (s serverTestEnv) assertAirdropped(t *testing.T, phone phoneTestEnv, airdropType AirdropType, intentId string, usdValue float64) {
 	airdropIntentRecord, err := s.data.GetIntent(s.ctx, intentId)
 	require.NoError(t, err)
@@ -1201,12 +1190,6 @@ func (s serverTestEnv) assertAirdropped(t *testing.T, phone phoneTestEnv, airdro
 	}
 }
 
-func (s serverTestEnv) assertNoNoncesReserved(t *testing.T) {
-	count, err := s.data.GetNonceCountByState(s.ctx, nonce.StateReserved)
-	require.NoError(t, err)
-	assert.EqualValues(t, 0, count)
-}
-
 func (s serverTestEnv) assertNoNoncesReservedForIntent(t *testing.T, intentId string) {
 	var cursor query.Cursor
 	for {
@@ -6159,12 +6142,6 @@ func (m submitIntentCallMetadata) assertGrpcError(t *testing.T, code codes.Code)
 	testutil.AssertStatusErrorWithCode(t, m.err, code)
 }
 
-func (m submitIntentCallMetadata) assertGrpcErrorWithMessage(t *testing.T, code codes.Code, message string) {
-	m.assertGrpcError(t, code)
-
-	assert.True(t, strings.Contains(m.err.Error(), message))
-}
-
 func (m submitIntentCallMetadata) isError(t *testing.T) bool {
 	return m.err != nil || m.resp.GetError() != nil
 }
diff --git a/pkg/osutil/memory.go b/pkg/osutil/memory.go
@@ -1,7 +1,7 @@
 package osutil
 
 import (
-	"io/ioutil"
+	"os"
 	"strconv"
 	"strings"
 
@@ -24,7 +24,7 @@ const (
 func GetTotalMemory() uint64 {
 	totalMemory := memory.TotalMemory()
 
-	cgroupLimit, err := ioutil.ReadFile(dockerMemoryLimitLocation)
+	cgroupLimit, err := os.ReadFile(dockerMemoryLimitLocation)
 	if err == nil {
 		dockerMemoryLimit, err := strconv.ParseUint(strings.Replace(string(cgroupLimit), "\n", "", 1), 10, 64)
 		if err == nil && dockerMemoryLimit != unrestrictedMemoryLimit {
diff --git a/pkg/solana/splitter/utils.go b/pkg/solana/splitter/utils.go
diff --git a/pkg/solana/swapvalidator/utils.go b/pkg/solana/swapvalidator/utils.go
diff --git a/pkg/solana/timelock/legacy_2022/utils.go b/pkg/solana/timelock/legacy_2022/utils.go
diff --git a/pkg/solana/timelock/v1/utils.go b/pkg/solana/timelock/v1/utils.go

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package async_account`
`3`	`3`	`// todo: setup configs`
`4`	`4`
`5`	`5`	`const (`
`6`		`- envConfigPrefix = "ACCOUNT_SERVICE_"`
	`6`	`+ envConfigPrefix = "ACCOUNT_SERVICE_" //nolint:unused`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`type conf struct {`
Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,12 @@ func TestTimelockV1ProgramAccountHandler(t *testing.T) {`
`16`	`16`
`17`	`17`	`}`
`18`	`18`
`19`		`-type testEnv struct {`
	`19`	`+type testEnv struct { //nolint:unused`
`20`	`20`	`data code_data.Provider`
`21`	`21`	`handlers map[string]ProgramAccountUpdateHandler`
`22`	`22`	`}`
`23`	`23`
`24`		`-func setup(t testing.T) testEnv {`
	`24`	`+func setup(t testing.T) testEnv { //nolint:unused`
`25`	`25`	`data := code_data.NewTestDataProvider()`
`26`	`26`	`return &testEnv{`
`27`	`27`	`data: data,`
Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ func (s *store) CountRequiringAutoReturnCheck(ctx context.Context) (uint64, erro`
`404`	`404`	`return uint64(len(items)), nil`
`405`	`405`	`}`
`406`	`406`
`407`		`-func cloneRecords(items []account.Record) []account.Record {`
	`407`	`+func cloneRecords(items []account.Record) []account.Record { //nolint:unused`
`408`	`408`	`res := make([]*account.Record, len(items))`
`409`	`409`
`410`	`410`	`for i, item := range items {`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ import (`
`6`	`6`	`"sync"`
`7`	`7`	`"time"`
`8`	`8`
`9`		`- "github.com/code-payments/code-server/pkg/database/query"`
`10`	`9`	`"github.com/code-payments/code-server/pkg/code/data/currency"`
	`10`	`+ "github.com/code-payments/code-server/pkg/database/query"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`const (`
`@@ -36,7 +36,7 @@ func New() currency.Store {`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`		`-func (s *store) reset() {`
	`39`	`+func (s *store) reset() { //nolint:unused`
`40`	`40`	`s.currencyStoreMu.Lock()`
`41`	`41`	`s.currencyStore = make([]*currency.ExchangeRateRecord, 0)`
`42`	`42`	`s.currencyStoreMu.Unlock()`