fix: lint errors

RSS3-Network · Apr 20, 2024 · bc62849 · bc62849
1 parent b95ce9b
commit bc62849
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -43,8 +43,8 @@ linters-settings:
       - shadow
       - fieldalignment
   gocognit:
-    min-complexity: 30
+    min-complexity: 20
   gocyclo:
-    min-complexity: 30
+    min-complexity: 20
   gocritic:
     disabled-tags: ["opinionated", "experimental"]
diff --git a/internal/database/dialer/cockroachdb/client_billing.go b/internal/database/dialer/cockroachdb/client_billing.go
@@ -71,7 +71,9 @@ func (c *client) PrepareBillingCollectTokens(ctx context.Context, nowTime time.T
 			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{
@@ -81,7 +83,7 @@ func (c *client) PrepareBillingCollectTokens(ctx context.Context, nowTime time.T
 						APICalls:        k.APICallsCurrent,
 					}).Error
 				} else {
-					// Error happens, but we don't know what's this, create a new record for now.
+					// 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,

diff --git a/internal/service/hub/model/key.go b/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
 		}

diff --git a/internal/service/hub/swagger/swagger.go b/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
 //	}

diff --git a/internal/service/indexer/l2/report_error.go 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()
 	}