all: add revive linter, excluding var-naming and unused-param.

var-naming has a _huge_ amount of conflicts (3k+) due to the use of
Id initialism instead of ID (and to a lesser extent, URL, HTTP, and
a few SCREAMING_SNAKE_CASES).

unused-param has a bunch laying around too that would add some noise.

Author: mfycheng

.golangci-lint.yaml

@@ -2,10 +2,17 @@ linters:
   enable:
     - bodyclose
     - whitespace
+    - revive
 
 issues:
   exclude-rules:
+    # var-naming conflicts are huge
+    - path: '(.+)\.go'
+      text: "var-naming"
+    # unused-parameter conflicts are sizeable
+    - path: '(.+)\.go'
+      text: "unused-parameter"
     - 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"

pkg/code/antispam/guard_test.go

@@ -214,7 +214,7 @@ func TestAllowSendPayment_StaffUser(t *testing.T) {
 			ownerAccount2 := testutil.NewRandomAccount(t)
 
 			require.NoError(t, env.data.PutUser(env.ctx, &identity.Record{
-				ID: user.NewUserID(),
+				ID: user.NewID(),
 				View: &user.View{
 					PhoneNumber: &phoneNumber,
 				},
@@ -366,7 +366,7 @@ func TestAllowReceivePayments_StaffUser(t *testing.T) {
 			ownerAccount2 := testutil.NewRandomAccount(t)
 
 			require.NoError(t, env.data.PutUser(env.ctx, &identity.Record{
-				ID: user.NewUserID(),
+				ID: user.NewID(),
 				View: &user.View{
 					PhoneNumber: &phoneNumber,
 				},
@@ -498,7 +498,7 @@ func TestAllowOpenAccounts_StaffUser(t *testing.T) {
 		ownerAccount2 := testutil.NewRandomAccount(t)
 
 		require.NoError(t, env.data.PutUser(env.ctx, &identity.Record{
-			ID: user.NewUserID(),
+			ID: user.NewID(),
 			View: &user.View{
 				PhoneNumber: &phoneNumber,
 			},
@@ -597,7 +597,7 @@ func TestAllowEstablishNewRelationship_StaffUser(t *testing.T) {
 		ownerAccount2 := testutil.NewRandomAccount(t)
 
 		require.NoError(t, env.data.PutUser(env.ctx, &identity.Record{
-			ID: user.NewUserID(),
+			ID: user.NewID(),
 			View: &user.View{
 				PhoneNumber: &phoneNumber,
 			},
@@ -690,7 +690,7 @@ func TestAllowNewPhoneVerification_StaffUser(t *testing.T) {
 	phoneNumber := "+12223334444"
 
 	require.NoError(t, env.data.PutUser(env.ctx, &identity.Record{
-		ID: user.NewUserID(),
+		ID: user.NewID(),
 		View: &user.View{
 			PhoneNumber: &phoneNumber,
 		},

pkg/code/async/commitment/testutil.go

@@ -74,7 +74,7 @@ func setup(t *testing.T) testEnv {
 
 		SolanaBlock: 123,
 
-		State: treasury.TreasuryPoolStateAvailable,
+		State: treasury.PoolStateAvailable,
 	}
 
 	merkleTree, err := db.InitializeNewMerkleTree(
@@ -193,7 +193,7 @@ func (e testEnv) simulateCommitment(t *testing.T, recentRoot string, state commi
 
 	timelockRecord := timelockAccounts.ToDBRecord()
 	timelockRecord.VaultState = timelock_token_v1.StateLocked
-	timelockRecord.Block += 1
+	timelockRecord.Block++
 	require.NoError(t, e.data.SaveTimelock(e.ctx, timelockRecord))
 
 	return commitmentRecord
@@ -215,7 +215,7 @@ func (e testEnv) simulateSourceAccountUnlocked(t *testing.T, commitmentRecord *c
 	require.NoError(t, err)
 
 	timelockRecord.VaultState = timelock_token_v1.StateUnlocked
-	timelockRecord.Block += 1
+	timelockRecord.Block++
 	require.NoError(t, e.data.SaveTimelock(e.ctx, timelockRecord))
 }
 
@@ -236,7 +236,7 @@ func (e testEnv) simulateAddingLeaves(t *testing.T, commitmentRecords []*commitm
 
 	e.treasuryPool.CurrentIndex = (e.treasuryPool.CurrentIndex + 1) % e.treasuryPool.HistoryListSize
 	e.treasuryPool.HistoryList[e.treasuryPool.CurrentIndex] = hex.EncodeToString(rootNode.Hash)
-	e.treasuryPool.SolanaBlock += 1
+	e.treasuryPool.SolanaBlock++
 	require.NoError(t, e.data.SaveTreasuryPool(e.ctx, e.treasuryPool))
 }
 

pkg/code/async/geyser/consumer.go

@@ -124,7 +124,7 @@ func (p *service) programUpdateWorker(serviceCtx context.Context, id int) {
 			}
 
 			p.metricStatusLock.Lock()
-			p.programUpdateWorkerMetrics[id].eventsProcessed += 1
+			p.programUpdateWorkerMetrics[id].eventsProcessed++
 			p.metricStatusLock.Unlock()
 		}()
 	}

pkg/code/async/geyser/messenger.go

@@ -170,7 +170,7 @@ func processPotentialBlockchainMessage(ctx context.Context, data code_data.Provi
 				ctx,
 				data,
 				asciiBaseDomain,
-				chat.ChatTypeExternalApp,
+				chat.TypeExternalApp,
 				true,
 				recipientOwner,
 				chatMessage,

pkg/code/async/geyser/metrics.go

@@ -80,7 +80,7 @@ func (p *service) recordEventWorkerStatusPollingEvent(ctx context.Context) {
 	var numActive int
 	for _, workerMetrics := range p.programUpdateWorkerMetrics {
 		if workerMetrics.active {
-			numActive += 1
+			numActive++
 		}
 		eventsProcessed += workerMetrics.eventsProcessed
 		workerMetrics.eventsProcessed = 0

pkg/code/async/sequencer/fulfillment_handler_test.go

@@ -236,7 +236,7 @@ func TestCloseDormantTimelockAccountFulfillmentHandler_IsRevoked(t *testing.T) {
 		timelock_token_v1.StateUnlocked,
 	} {
 		timelockRecord.VaultState = state
-		timelockRecord.Block += 1
+		timelockRecord.Block++
 		require.NoError(t, env.data.SaveTimelock(env.ctx, timelockRecord))
 
 		revoked, nonceUsed, err := handler.IsRevoked(env.ctx, fulfillmentRecord)
@@ -248,7 +248,7 @@ func TestCloseDormantTimelockAccountFulfillmentHandler_IsRevoked(t *testing.T) {
 	}
 
 	timelockRecord.VaultState = timelock_token_v1.StateClosed
-	timelockRecord.Block += 1
+	timelockRecord.Block++
 	require.NoError(t, env.data.SaveTimelock(env.ctx, timelockRecord))
 
 	revoked, nonceUsed, err := handler.IsRevoked(env.ctx, fulfillmentRecord)
@@ -832,7 +832,7 @@ func TestIsTokenAccountOnBlockchain_CodeAccount(t *testing.T) {
 		timelock_token_v1.StateClosed,
 	} {
 		timelockRecord.VaultState = state
-		timelockRecord.Block += 1
+		timelockRecord.Block++
 		require.NoError(t, env.data.SaveTimelock(env.ctx, timelockRecord))
 
 		actual, err := isTokenAccountOnBlockchain(env.ctx, env.data, timelockRecord.VaultAddress)

pkg/code/async/sequencer/scheduler_test.go

@@ -926,7 +926,7 @@ func TestContextualScheduler_PrivateTransfer_TemporaryPrivacyFlow(t *testing.T)
 		require.NoError(t, err)
 
 		timelockRecord.VaultState = timelock_token_v1.StateUnlocked
-		timelockRecord.Block += 1
+		timelockRecord.Block++
 		require.NoError(t, env.data.SaveTimelock(env.ctx, timelockRecord))
 	}
 
@@ -2180,7 +2180,7 @@ func (e *schedulerTestEnv) setupSchedulerTest(t *testing.T, intentRecords []*int
 		HistoryListSize:  1,
 		HistoryList:      []string{"unused"},
 		SolanaBlock:      123,
-		State:            treasury.TreasuryPoolStateAvailable,
+		State:            treasury.PoolStateAvailable,
 	}
 	require.NoError(t, e.data.SaveTreasuryPool(e.ctx, treasuryPoolRecord))
 
@@ -2380,7 +2380,7 @@ func (e *schedulerTestEnv) setupSchedulerTest(t *testing.T, intentRecords []*int
 				closeNewOutgoing,
 			)
 
-			currentOutgoingByUser[intentRecord.InitiatorOwnerAccount] += 1
+			currentOutgoingByUser[intentRecord.InitiatorOwnerAccount]++
 		case intent.ReceivePaymentsPrivately:
 			assert.True(t, intentRecord.ReceivePaymentsPrivatelyMetadata.Quantity < kin.ToQuarks(1000))
 
@@ -2472,7 +2472,7 @@ func (e *schedulerTestEnv) setupSchedulerTest(t *testing.T, intentRecords []*int
 				closeNewIncoming,
 			)
 
-			currentIncomingByUser[intentRecord.InitiatorOwnerAccount] += 1
+			currentIncomingByUser[intentRecord.InitiatorOwnerAccount]++
 		case intent.SendPublicPayment:
 			newActionRecords = append(
 				newActionRecords,
@@ -3020,7 +3020,7 @@ func (e *schedulerTestEnv) assertReservedTreasuryFunds(t *testing.T, expected ui
 }
 
 func (e *schedulerTestEnv) getNextSlot() uint64 {
-	e.nextSlot += 1
+	e.nextSlot++
 	return e.nextSlot
 }
 

pkg/code/async/treasury/merkle_tree.go

@@ -8,16 +8,16 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
-	"github.com/code-payments/code-server/pkg/database/query"
-	"github.com/code-payments/code-server/pkg/solana"
-	splitter_token "github.com/code-payments/code-server/pkg/solana/splitter"
 	"github.com/code-payments/code-server/pkg/code/data/commitment"
 	"github.com/code-payments/code-server/pkg/code/data/fulfillment"
 	"github.com/code-payments/code-server/pkg/code/data/intent"
 	"github.com/code-payments/code-server/pkg/code/data/merkletree"
 	"github.com/code-payments/code-server/pkg/code/data/payment"
 	"github.com/code-payments/code-server/pkg/code/data/transaction"
 	"github.com/code-payments/code-server/pkg/code/data/treasury"
+	"github.com/code-payments/code-server/pkg/database/query"
+	"github.com/code-payments/code-server/pkg/solana"
+	splitter_token "github.com/code-payments/code-server/pkg/solana/splitter"
 )
 
 func (p *service) syncMerkleTree(ctx context.Context, treasuryPoolRecord *treasury.Record) error {
@@ -214,15 +214,15 @@ func (p *service) syncMerkleTree(ctx context.Context, treasuryPoolRecord *treasu
 		endingBlockToQuery := endingBlock + 1
 		startingBlockToQuery := startingBlock
 		if startingBlockToQuery > 0 {
-			startingBlockToQuery -= 1
+			startingBlockToQuery--
 		}
 
 		paymentRecords, err := p.data.GetPaymentHistoryWithinBlockRange(
 			ctx,
 			treasuryPoolRecord.Vault,
 			startingBlockToQuery,
 			endingBlockToQuery,
-			query.WithFilter(query.Filter{Value: uint64(payment.PaymentType_Send), Valid: true}),
+			query.WithFilter(query.Filter{Value: uint64(payment.TypeSend), Valid: true}),
 			query.WithLimit(1000),
 			query.WithCursor(cursor),
 		)

pkg/code/async/treasury/metrics.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"time"
 
-	"github.com/code-payments/code-server/pkg/kin"
-	"github.com/code-payments/code-server/pkg/metrics"
 	code_data "github.com/code-payments/code-server/pkg/code/data"
 	"github.com/code-payments/code-server/pkg/code/data/treasury"
+	"github.com/code-payments/code-server/pkg/kin"
+	"github.com/code-payments/code-server/pkg/metrics"
 )
 
 const (
@@ -26,7 +26,7 @@ func (p *service) metricsGaugeWorker(ctx context.Context) error {
 		case <-time.After(delay):
 			start := time.Now()
 
-			treasuryPoolRecords, err := p.data.GetAllTreasuryPoolsByState(ctx, treasury.TreasuryPoolStateAvailable)
+			treasuryPoolRecords, err := p.data.GetAllTreasuryPoolsByState(ctx, treasury.PoolStateAvailable)
 			if err != nil {
 				continue
 			}