chore: add strict linters

.golangci.yaml

@@ -5,12 +5,13 @@ linters:
   enable:
     - asasalint
     - asciicheck
-    - cyclop
     - bodyclose
     - durationcheck
     - errcheck
     - errorlint
     - gci
+    - gocognit
+    - gocritic
     - gocyclo
     - gosec
     - govet
@@ -34,3 +35,16 @@ linters:
 issues:
   max-issues-per-linter: 0 # Unlimited
   max-same-issues: 0 # Unlimited
+
+linters-settings:
+  govet:
+    enable-all: true
+    disable:
+      - shadow
+      - fieldalignment
+  gocognit:
+    min-complexity: 20
+  gocyclo:
+    min-complexity: 20
+  gocritic:
+    disabled-tags: ["opinionated", "experimental"]

internal/database/dialer/cockroachdb/client_billing.go

@@ -40,6 +40,44 @@ func (c *client) SaveBillingRecordCollected(ctx context.Context, billingRecord *
 	return c.database.WithContext(ctx).Create(&value).Error
 }
 
+func (c *client) prepareBillingCollectTokensCreateOrUpdateConsumptionLog(nowTime time.Time, k *table.GatewayKey, tx *gorm.DB) error {
+	var possibleExistLog table.GatewayConsumptionLog
+	err := tx.Where("consumption_date = ? AND key_id = ?", nowTime, k.ID).
+		First(&possibleExistLog).
+		Error
+
+	if err != nil {
+		// nolint: gocritic
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			// Fine, let's create it
+			err = tx.Create(&table.GatewayConsumptionLog{
+				KeyID:           k.ID,
+				ConsumptionDate: nowTime,
+				RuUsed:          k.RuUsedCurrent,
+				APICalls:        k.APICallsCurrent,
+			}).Error
+		} else {
+			// TODO: Error happens, but we don't know what's this, create a new record for now.
+			err = tx.Create(&table.GatewayConsumptionLog{
+				KeyID:           k.ID,
+				ConsumptionDate: nowTime,
+				RuUsed:          k.RuUsedCurrent,
+				APICalls:        k.APICallsCurrent,
+			}).Error
+		}
+	} else {
+		// Already exists - this shouldn't happen; but when it happens, it happens
+		err = tx.Model(&table.GatewayConsumptionLog{}).
+			Where("id = ?", possibleExistLog.ID).
+			Updates(map[string]interface{}{
+				"ru_used":   gorm.Expr("ru_used + ?", k.RuUsedCurrent),
+				"api_calls": gorm.Expr("api_calls + ?", k.APICallsCurrent),
+			}).Error
+	}
+
+	return err
+}
+
 func (c *client) PrepareBillingCollectTokens(ctx context.Context, nowTime time.Time) (*map[common.Address]schema.BillingCollectDataPerAddress, error) {
 	// Get all keys whose ru_used_current is > 0
 	var activeKeys []table.GatewayKey
@@ -66,38 +104,10 @@ func (c *client) PrepareBillingCollectTokens(ctx context.Context, nowTime time.T
 	for _, k := range activeKeys {
 		// w/ database tx
 		err = c.database.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+			k := k
+
 			// Create or update consumption log
-			var possibleExistLog table.GatewayConsumptionLog
-			err = tx.Where("consumption_date = ? AND key_id = ?", nowTime, k.ID).
-				First(&possibleExistLog).
-				Error
-			if err != nil {
-				if errors.Is(err, gorm.ErrRecordNotFound) {
-					// Fine, let's create it
-					err = tx.Create(&table.GatewayConsumptionLog{
-						KeyID:           k.ID,
-						ConsumptionDate: nowTime,
-						RuUsed:          k.RuUsedCurrent,
-						APICalls:        k.APICallsCurrent,
-					}).Error
-				} else {
-					// Error happens, but we don't know what's this, create a new record for now.
-					err = tx.Create(&table.GatewayConsumptionLog{
-						KeyID:           k.ID,
-						ConsumptionDate: nowTime,
-						RuUsed:          k.RuUsedCurrent,
-						APICalls:        k.APICallsCurrent,
-					}).Error
-				}
-			} else {
-				// Already exists - this shouldn't happen; but when it happens, it happens
-				err = tx.Model(&table.GatewayConsumptionLog{}).
-					Where("id = ?", possibleExistLog.ID).
-					Updates(map[string]interface{}{
-						"ru_used":   gorm.Expr("ru_used + ?", k.RuUsedCurrent),
-						"api_calls": gorm.Expr("api_calls + ?", k.APICallsCurrent),
-					}).Error
-			}
+			err = c.prepareBillingCollectTokensCreateOrUpdateConsumptionLog(nowTime, &k, tx)
 			if err != nil {
 				zap.L().Error("create or update consumption log", zap.Error(err), zap.Any("key", k))
 				// but no need to stop here - data error can be fixed later, let's focus on billing now

internal/service/hub/model/key.go

@@ -50,7 +50,7 @@ func KeyCreate(ctx context.Context, accountAddress common.Address, keyName strin
 	return &Key{k, databaseClient, controlClient}, nil
 }
 
-func KeyGetByID(ctx context.Context, KeyID uint64, activeOnly bool, databaseClient *gorm.DB, controlClient *control.StateClientWriter) (*Key, bool, error) {
+func KeyGetByID(ctx context.Context, keyID uint64, activeOnly bool, databaseClient *gorm.DB, controlClient *control.StateClientWriter) (*Key, bool, error) {
 	queryBase := databaseClient.WithContext(ctx).Model(&table.GatewayKey{})
 
 	if activeOnly {
@@ -59,7 +59,7 @@ func KeyGetByID(ctx context.Context, KeyID uint64, activeOnly bool, databaseClie
 
 	var k table.GatewayKey
 
-	if err := queryBase.Where("id = ?", KeyID).First(&k).Error; err != nil {
+	if err := queryBase.Where("id = ?", keyID).First(&k).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, false, nil
 		}

internal/service/hub/swagger/swagger.go

@@ -15,19 +15,19 @@ import (
 
 type Opts func(*config)
 
-//func SetSwaggerHost(host string) Opts {
+// func SetSwaggerHost(host string) Opts {
 //	return func(o *config) {
 //		o.SwaggerHost = host
 //	}
 //}
 //
-//func SetSwaggerAuthorizer(f func(*http.Request) bool) Opts {
+// func SetSwaggerAuthorizer(f func(*http.Request) bool) Opts {
 //	return func(o *config) {
 //		o.Authorizer = f
 //	}
 //}
 //
-//func SetSwaggerIsHTTPS(b bool) Opts {
+// func SetSwaggerIsHTTPS(b bool) Opts {
 //	return func(o *config) {
 //		o.IsHTTPS = b
 //	}

internal/service/indexer/l2/report_error.go

@@ -55,11 +55,12 @@ func (s *server) sendNotificationMessage(txErr error, txHash string, txFunc stri
 	// Send base information
 	var errReason string
 
-	if errors.Is(txErr, errors.New("transaction failed")) {
+	switch {
+	case errors.Is(txErr, errors.New("transaction failed")):
 		errReason = "Failed"
-	} else if errors.Is(txErr, context.DeadlineExceeded) {
+	case errors.Is(txErr, context.DeadlineExceeded):
 		errReason = "Timeout (/!\\ doesn't mean it failed)"
-	} else {
+	default:
 		// Unknown error
 		errReason = txErr.Error()
 	}