all: address staticcheck linter errors

Author: mfycheng

.golangci-lint.yaml

@@ -7,6 +7,7 @@ linters:
     - ineffassign
     - govet
     - gosimple
+    - staticcheck
 
 issues:
   exclude-rules:

pkg/code/async/account/gift_card.go

@@ -41,7 +41,7 @@ func (p *service) giftCardAutoReturnWorker(serviceCtx context.Context, interval
 		func() (err error) {
 			time.Sleep(delay)
 
-			nr := serviceCtx.Value(metrics.NewRelicContextKey).(*newrelic.Application)
+			nr := serviceCtx.Value(metrics.NewRelicContextKey{}).(*newrelic.Application)
 			m := nr.StartTransaction("async__account_service__handle_gift_card_auto_return")
 			defer m.End()
 			tracedCtx := newrelic.NewContext(serviceCtx, m)

pkg/code/async/commitment/testutil.go

@@ -3,10 +3,11 @@ package async_commitment
 import (
 	"context"
 	"crypto/ed25519"
+	"crypto/rand"
 	"encoding/hex"
 	"fmt"
 	"math"
-	"math/rand"
+	mrand "math/rand"
 	"testing"
 	"time"
 
@@ -123,7 +124,7 @@ func (e testEnv) simulateCommitment(t *testing.T, recentRoot string, state commi
 		Amount:      kin.ToQuarks(1),
 
 		Intent:   testutil.NewRandomAccount(t).PublicKey().ToBase58(),
-		ActionId: rand.Uint32(),
+		ActionId: mrand.Uint32(),
 
 		Owner: testutil.NewRandomAccount(t).PublicKey().ToBase58(),
 
@@ -178,7 +179,7 @@ func (e testEnv) simulateCommitment(t *testing.T, recentRoot string, state commi
 
 		FulfillmentType: fulfillment.TemporaryPrivacyTransferWithAuthority,
 		Data:            []byte("data"),
-		Signature:       pointer.String(fmt.Sprintf("sig%d", rand.Uint64())),
+		Signature:       pointer.String(fmt.Sprintf("sig%d", mrand.Uint64())),
 
 		Nonce:     pointer.String(testutil.NewRandomAccount(t).PublicKey().ToBase58()),
 		Blockhash: pointer.String("bh"),
@@ -276,7 +277,7 @@ func (e testEnv) simulateCommitmentBeingUpgraded(t *testing.T, upgradeFrom, upgr
 
 	permanentPrivacyFulfillment := fulfillmentRecords[0].Clone()
 	permanentPrivacyFulfillment.Id = 0
-	permanentPrivacyFulfillment.Signature = pointer.String(fmt.Sprintf("txn%d", rand.Uint64()))
+	permanentPrivacyFulfillment.Signature = pointer.String(fmt.Sprintf("txn%d", mrand.Uint64()))
 	permanentPrivacyFulfillment.FulfillmentType = fulfillment.PermanentPrivacyTransferWithAuthority
 	permanentPrivacyFulfillment.Destination = &upgradeTo.Vault
 	require.NoError(t, e.data.PutAllFulfillments(e.ctx, &permanentPrivacyFulfillment))
@@ -492,7 +493,8 @@ func (e *testEnv) generateAvailableNonce(t *testing.T) *nonce.Record {
 	nonceAccount := testutil.NewRandomAccount(t)
 
 	var bh solana.Blockhash
-	rand.Read(bh[:])
+	_, err := rand.Read(bh[:])
+	require.NoError(t, err)
 
 	nonceKey := &vault.Record{
 		PublicKey:  nonceAccount.PublicKey().ToBase58(),

pkg/code/async/commitment/worker.go

@@ -60,7 +60,7 @@ func (p *service) worker(serviceCtx context.Context, state commitment.State, int
 		func() (err error) {
 			time.Sleep(delay)
 
-			nr := serviceCtx.Value(metrics.NewRelicContextKey).(*newrelic.Application)
+			nr := serviceCtx.Value(metrics.NewRelicContextKey{}).(*newrelic.Application)
 			m := nr.StartTransaction("async__commitment_service__handle_" + state.String())
 			defer m.End()
 			tracedCtx := newrelic.NewContext(serviceCtx, m)

pkg/code/async/currency/exchange_rate.go

@@ -35,7 +35,7 @@ func (p *exchangeRateService) Start(serviceCtx context.Context, interval time.Du
 			func() error {
 				p.log.Trace("updating exchange rates")
 
-				nr := serviceCtx.Value(metrics.NewRelicContextKey).(*newrelic.Application)
+				nr := serviceCtx.Value(metrics.NewRelicContextKey{}).(*newrelic.Application)
 				m := nr.StartTransaction("async__currency_service")
 				defer m.End()
 				tracedCtx := newrelic.NewContext(serviceCtx, m)

pkg/code/async/geyser/backup.go

@@ -41,7 +41,7 @@ func (p *service) backupTimelockStateWorker(serviceCtx context.Context, interval
 			start := time.Now()
 
 			func() {
-				nr := serviceCtx.Value(metrics.NewRelicContextKey).(*newrelic.Application)
+				nr := serviceCtx.Value(metrics.NewRelicContextKey{}).(*newrelic.Application)
 				m := nr.StartTransaction("async__geyser_consumer_service__backup_timelock_state_worker")
 				defer m.End()
 				tracedCtx := newrelic.NewContext(serviceCtx, m)
@@ -113,7 +113,7 @@ func (p *service) backupExternalDepositWorker(serviceCtx context.Context, interv
 		select {
 		case <-time.After(interval):
 			func() {
-				nr := serviceCtx.Value(metrics.NewRelicContextKey).(*newrelic.Application)
+				nr := serviceCtx.Value(metrics.NewRelicContextKey{}).(*newrelic.Application)
 				m := nr.StartTransaction("async__geyser_consumer_service__backup_external_deposit_worker")
 				defer m.End()
 				tracedCtx := newrelic.NewContext(serviceCtx, m)
@@ -186,7 +186,7 @@ func (p *service) backupMessagingWorker(serviceCtx context.Context, interval tim
 			start := time.Now()
 
 			func() {
-				nr := serviceCtx.Value(metrics.NewRelicContextKey).(*newrelic.Application)
+				nr := serviceCtx.Value(metrics.NewRelicContextKey{}).(*newrelic.Application)
 				m := nr.StartTransaction("async__geyser_consumer_service__backup_messaging_worker")
 				defer m.End()
 				tracedCtx := newrelic.NewContext(serviceCtx, m)

pkg/code/async/geyser/consumer.go

@@ -8,8 +8,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
-	"github.com/code-payments/code-server/pkg/metrics"
 	"github.com/code-payments/code-server/pkg/code/common"
+	"github.com/code-payments/code-server/pkg/metrics"
 )
 
 func (p *service) consumeGeyserProgramUpdateEvents(ctx context.Context) error {
@@ -76,7 +76,7 @@ func (p *service) programUpdateWorker(serviceCtx context.Context, id int) {
 
 	for update := range p.programUpdatesChan {
 		func() {
-			nr := serviceCtx.Value(metrics.NewRelicContextKey).(*newrelic.Application)
+			nr := serviceCtx.Value(metrics.NewRelicContextKey{}).(*newrelic.Application)
 			m := nr.StartTransaction("async__geyser_consumer_service__program_update_worker")
 			defer m.End()
 			tracedCtx := newrelic.NewContext(serviceCtx, m)

pkg/code/async/nonce/allocator.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"time"
 
+	"github.com/code-payments/code-server/pkg/code/data/nonce"
 	"github.com/code-payments/code-server/pkg/metrics"
 	"github.com/code-payments/code-server/pkg/retry"
-	"github.com/code-payments/code-server/pkg/code/data/nonce"
 	"github.com/newrelic/go-agent/v3/newrelic"
 )
 
@@ -17,7 +17,7 @@ func (p *service) generateNonceAccounts(serviceCtx context.Context) error {
 		func() (err error) {
 			time.Sleep(time.Second)
 
-			nr := serviceCtx.Value(metrics.NewRelicContextKey).(*newrelic.Application)
+			nr := serviceCtx.Value(metrics.NewRelicContextKey{}).(*newrelic.Application)
 			m := nr.StartTransaction("async__nonce_service__nonce_accounts")
 			defer m.End()
 			tracedCtx := newrelic.NewContext(serviceCtx, m)

pkg/code/async/nonce/keys.go

@@ -36,7 +36,7 @@ func (p *service) generateKeys(ctx context.Context) error {
 			// Give the server some time to breath.
 			time.Sleep(time.Second * 15)
 
-			nr := ctx.Value(metrics.NewRelicContextKey).(*newrelic.Application)
+			nr := ctx.Value(metrics.NewRelicContextKey{}).(*newrelic.Application)
 			m := nr.StartTransaction("async__nonce_service__vault_keys")
 			defer func() {
 				m.End()

pkg/code/async/nonce/pool.go

@@ -8,13 +8,13 @@ import (
 	"github.com/mr-tron/base58/base58"
 	"github.com/newrelic/go-agent/v3/newrelic"
 
+	"github.com/code-payments/code-server/pkg/code/data/nonce"
+	"github.com/code-payments/code-server/pkg/code/data/transaction"
 	"github.com/code-payments/code-server/pkg/database/query"
 	"github.com/code-payments/code-server/pkg/metrics"
 	"github.com/code-payments/code-server/pkg/retry"
 	"github.com/code-payments/code-server/pkg/solana"
 	"github.com/code-payments/code-server/pkg/solana/system"
-	"github.com/code-payments/code-server/pkg/code/data/nonce"
-	"github.com/code-payments/code-server/pkg/code/data/transaction"
 )
 
 func (p *service) worker(serviceCtx context.Context, state nonce.State, interval time.Duration) error {
@@ -25,7 +25,7 @@ func (p *service) worker(serviceCtx context.Context, state nonce.State, interval
 		func() (err error) {
 			time.Sleep(delay)
 
-			nr := serviceCtx.Value(metrics.NewRelicContextKey).(*newrelic.Application)
+			nr := serviceCtx.Value(metrics.NewRelicContextKey{}).(*newrelic.Application)
 			m := nr.StartTransaction("async__nonce_service__handle_" + state.String())
 			defer m.End()
 			tracedCtx := newrelic.NewContext(serviceCtx, m)