fix warnings & re-eenable golangci-lint

ethpandaops · May 28, 2024 · f4739fc · f4739fc
1 parent c95afdf
commit f4739fc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/.github/workflows/_shared-check.yaml b/.github/workflows/_shared-check.yaml
@@ -32,11 +32,11 @@ jobs:
       run: staticcheck ./...
 
 
-    #- name: Run golangci-lint
-    #  uses: golangci/golangci-lint-action@v3
-    #  with:
+    - name: Run golangci-lint
+      uses: golangci/golangci-lint-action@v3
+      with:
         # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-    #    version: v1.56.1
+        version: v1.56.1
 
         # Optional: working directory, useful for monorepos
         # working-directory: somedir

diff --git a/pkg/coordinator/helper/bigint.go b/pkg/coordinator/helper/bigint.go
@@ -17,12 +17,16 @@ func (b *BigInt) UnmarshalJSON(p []byte) error {
 	if string(p) == "null" {
 		return nil
 	}
+
 	var z big.Int
+
 	_, ok := z.SetString(string(p), 10)
 	if !ok {
 		return fmt.Errorf("not a valid big integer: %s", p)
 	}
+
 	b.Value = z
+
 	return nil
 }
 
@@ -37,12 +41,16 @@ func (b *BigInt) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	if value == "null" {
 		return nil
 	}
+
 	var z big.Int
+
 	_, ok := z.SetString(value, 10)
 	if !ok {
 		return fmt.Errorf("not a valid big integer: %s", &b.Value)
 	}
+
 	b.Value = z
+
 	return nil
 }
 

diff --git a/pkg/coordinator/tasks/generate_deposits/task.go b/pkg/coordinator/tasks/generate_deposits/task.go
@@ -303,17 +303,19 @@ func (t *Task) generateDeposit(ctx context.Context, accountIdx uint64, onConfirm
 	}
 
 	var pub common.BLSPubkey
+
 	var withdrCreds []byte
 
 	copy(pub[:], validatorPubkey)
 
 	if t.config.WithdrawalCredentials == "" {
-		withdrPrivkey, err := util.PrivateKeyFromSeedAndPath(t.valkeySeed, withdrAccPath)
-		if err != nil {
-			return nil, nil, fmt.Errorf("failed generating key %v: %w", withdrAccPath, err)
+		withdrPrivkey, err2 := util.PrivateKeyFromSeedAndPath(t.valkeySeed, withdrAccPath)
+		if err2 != nil {
+			return nil, nil, fmt.Errorf("failed generating key %v: %w", withdrAccPath, err2)
 		}
 
 		var withdrPub common.BLSPubkey
+
 		copy(withdrPub[:], withdrPrivkey.PublicKey().Marshal())
 
 		withdrCreds = withdrPub[:]