Various minor linter cleanup

rocket-pool · May 7, 2024 · c6452ca · c6452ca
1 parent 1fb5c25
commit c6452ca
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/beacon/client/std-http-client.go b/beacon/client/std-http-client.go
@@ -653,6 +653,7 @@ func (c *StandardHttpClient) getFinalityCheckpoints(ctx context.Context, stateId
 }
 
 // Get fork
+/*
 func (c *StandardHttpClient) getFork(ctx context.Context, stateId string) (ForkResponse, error) {
 	responseBody, status, err := c.getRequest(ctx, fmt.Sprintf(RequestForkPath, stateId))
 	if err != nil {
@@ -667,6 +668,7 @@ func (c *StandardHttpClient) getFork(ctx context.Context, stateId string) (ForkR
 	}
 	return fork, nil
 }
+*/
 
 // Get validators
 func (c *StandardHttpClient) getValidators(ctx context.Context, stateId string, pubkeys []string) (ValidatorsResponse, error) {

diff --git a/config/utils.go b/config/utils.go
@@ -42,14 +42,14 @@ func GetPortModes(warningOverride string) []*ParameterOption[RpcPortMode] {
 func GetExternalIP() (net.IP, error) {
 	// Try IPv4 first
 	ip4Consensus := externalip.DefaultConsensus(nil, nil)
-	ip4Consensus.UseIPProtocol(4)
+	_ = ip4Consensus.UseIPProtocol(4)
 	if ip, err := ip4Consensus.ExternalIP(); err == nil {
 		return ip, nil
 	}
 
 	// Try IPv6 as fallback
 	ip6Consensus := externalip.DefaultConsensus(nil, nil)
-	ip6Consensus.UseIPProtocol(6)
+	_ = ip6Consensus.UseIPProtocol(6)
 	return ip6Consensus.ExternalIP()
 }
 

diff --git a/node/validator/keystore/lodestar.go b/node/validator/keystore/lodestar.go
@@ -2,7 +2,6 @@ package keystore
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -80,7 +79,7 @@ func (ks *LodestarKeystoreManager) StoreValidatorKey(key *eth2types.BLSPrivateKe
 	}
 
 	// Write secret to disk
-	if err := ioutil.WriteFile(secretFilePath, []byte(password), FileMode); err != nil {
+	if err := os.WriteFile(secretFilePath, []byte(password), FileMode); err != nil {
 		return fmt.Errorf("error writing validator secret to disk: %w", err)
 	}
 
@@ -93,7 +92,7 @@ func (ks *LodestarKeystoreManager) StoreValidatorKey(key *eth2types.BLSPrivateKe
 	}
 
 	// Write key store to disk
-	if err := ioutil.WriteFile(keyFilePath, keyStoreBytes, FileMode); err != nil {
+	if err := os.WriteFile(keyFilePath, keyStoreBytes, FileMode); err != nil {
 		return fmt.Errorf("error writing validator key to disk: %w", err)
 	}
 	return nil

diff --git a/utils/input/validation.go b/utils/input/validation.go
@@ -201,7 +201,7 @@ func ValidateWalletMnemonic(name, value string) (string, error) {
 
 // Validate a timezone location
 func ValidateTimezoneLocation(name, value string) (string, error) {
-	if !regexp.MustCompile("^([a-zA-Z_]{2,}\\/)+[a-zA-Z_]{2,}$").MatchString(value) {
+	if !regexp.MustCompile(`^([a-zA-Z_]{2,}\/)+[a-zA-Z_]{2,}$`).MatchString(value) {
 		return "", fmt.Errorf("Invalid %s '%s' - must be in the format 'Country/City'", name, value)
 	}
 	return value, nil
@@ -260,9 +260,7 @@ func ValidatePubkey(name, value string) (beacon.ValidatorPubkey, error) {
 // Validate a hex-encoded byte array
 func ValidateByteArray(name, value string) ([]byte, error) {
 	// Remove a 0x prefix if present
-	if strings.HasPrefix(value, "0x") {
-		value = value[2:]
-	}
+	value = strings.TrimPrefix(value, "0x")
 
 	// Try to parse the string (removing the prefix)
 	bytes, err := hex.DecodeString(value)