ci: refresh golangci linting rules

zeta-chain · Jul 25, 2024 · 3af98a6 · 3af98a6
1 parent d886fcf
commit 3af98a6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/.gitleaks.toml b/.gitleaks.toml
@@ -21,8 +21,7 @@ paths = [
     '''init.sh'''
 ]
 regexes = [
-    '''#nosec''',
-    '''//nosec'''
+    '''(EthSecp256k1)'''
     ]
 
 [[rules]]

diff --git a/.golangci.yml b/.golangci.yml
@@ -36,39 +36,36 @@ linters:
     - whitespace
 
 issues:
+  exclude:
+    - composite
+  exclude-generated: strict
+  exclude-dirs: ['.git', '.github']
   exclude-rules:
     - path: _test\.go
       linters:
         - gosec
     - linters:
         - lll
-      source: "https://"
+      source: 'https://'
   max-same-issues: 50
 
 linters-settings:
   lll:
     line-length: 150
   dogsled:
     max-blank-identifiers: 3
-  golint:
-    min-confidence: 0
-  maligned:
-    suggest-new: true
   misspell:
     locale: US
   nolintlint:
     allow-unused: false
-    allow-leading-space: true
     require-explanation: false
     require-specific: false
-  gofumpt:
-    lang-version: "1.19"
   gomodguard:
     blocked:
-      versions:  # List of blocked module version constraints
-        - https://github.com/etcd-io/etcd:  # Blocked module with version constraint
-            version: ">= 3.4.10 || ~3.3.23"  # Version constraint, see https://github.com/Masterminds/semver#basic-comparisons
-            reason: "CVE-2020-15114; CVE-2020-15136; CVE-2020-15115"  # Reason why the version constraint exists. (Optional)
-        - https://github.com/dgrijalva/jwt-go:  # Blocked module with version constraint
-            version: ">= 4.0.0-preview1"  # Version constraint, see https://github.com/Masterminds/semver#basic-comparisons
-            reason: "CVE-2020-26160"  # Reason why the version constraint exists. (Optional)
+      versions: # List of blocked module version constraints
+        - https://github.com/etcd-io/etcd: # Blocked module with version constraint
+            version: '>= 3.4.10 || ~3.3.23' # Version constraint, see https://github.com/Masterminds/semver#basic-comparisons
+            reason: 'CVE-2020-15114; CVE-2020-15136; CVE-2020-15115' # Reason why the version constraint exists. (Optional)
+        - https://github.com/dgrijalva/jwt-go: # Blocked module with version constraint
+            version: '>= 4.0.0-preview1' # Version constraint, see https://github.com/Masterminds/semver#basic-comparisons
+            reason: 'CVE-2020-26160' # Reason why the version constraint exists. (Optional)
diff --git a/crypto/hd/algorithm.go b/crypto/hd/algorithm.go
@@ -56,7 +56,6 @@ func EthSecp256k1Option() keyring.Option {
 }
 
 var (
-	//nosec
 	_ keyring.SignatureAlgo = EthSecp256k1
 
 	// EthSecp256k1 uses the Bitcoin secp256k1 ECDSA parameters.
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,7 +56,6 @@ func EthSecp256k1Option() keyring.Option { @@
     }
     var (
-    	//nosec
     	_ keyring.SignatureAlgo = EthSecp256k1
     	// EthSecp256k1 uses the Bitcoin secp256k1 ECDSA parameters.
@@ Expand Down @@