Add unused linter, delete unused code

Author: jshufro

.golangci.yml

@@ -2,6 +2,7 @@ version: "2"
 linters:
   default: none 
   enable:
+    - unused
     - staticcheck
   settings:
     staticcheck:

bindings/dao/protocol/dao.go

@@ -3,7 +3,6 @@ package minipool
 import (
 	"fmt"
 	"strings"
-	"sync"
 
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
@@ -77,12 +76,3 @@ func createMinipoolContractFromAbi(rp *rocketpool.RocketPool, address common.Add
 		Client:   rp.Client,
 	}, nil
 }
-
-// Get a minipool contract
-var rocketMinipoolLock sync.Mutex
-
-func getMinipoolContract(rp *rocketpool.RocketPool, minipoolAddress common.Address, opts *bind.CallOpts) (*rocketpool.Contract, error) {
-	rocketMinipoolLock.Lock()
-	defer rocketMinipoolLock.Unlock()
-	return rp.MakeContract("rocketMinipool", minipoolAddress, opts)
-}

bindings/minipool/minipool-constructor.go

@@ -155,25 +155,6 @@ func (c *Contract) estimateGasLimit(opts *bind.TransactOpts, input []byte) (uint
 
 }
 
-// Wait for a transaction to be mined and get a tx receipt
-func (c *Contract) getTransactionReceipt(tx *types.Transaction) (*types.Receipt, error) {
-
-	// Wait for transaction to be mined
-	txReceipt, err := bind.WaitMined(context.Background(), c.Client, tx)
-	if err != nil {
-		return nil, err
-	}
-
-	// Check transaction status
-	if txReceipt.Status == 0 {
-		return txReceipt, errors.New("Transaction failed with status 0")
-	}
-
-	// Return
-	return txReceipt, nil
-
-}
-
 // Get contract events from a transaction
 // eventPrototype must be an event struct type
 // Returns a slice of untyped values; assert returned events to event struct type

bindings/rocketpool/contract.go

@@ -3,17 +3,13 @@ package node
 import (
 	"fmt"
 	"strings"
-	"time"
 
 	"github.com/rocket-pool/smartnode/shared/services/rocketpool"
 	"github.com/rocket-pool/smartnode/shared/types/api"
 	cliutils "github.com/rocket-pool/smartnode/shared/utils/cli"
 	"github.com/rocket-pool/smartnode/shared/utils/cli/color"
 )
 
-// Settings
-var ethClientRecentBlockThreshold, _ = time.ParseDuration("5m")
-
 func printClientStatus(status *api.ClientStatus, name string) {
 
 	if status.Error != "" {

rocketpool-cli/node/sync.go

@@ -13,15 +13,8 @@ import (
 	"unicode"
 
 	"github.com/goccy/go-json"
-	"github.com/mitchellh/go-homedir"
-	"gopkg.in/yaml.v2"
 
-	"github.com/rocket-pool/smartnode/bindings/types"
-	"github.com/rocket-pool/smartnode/shared/services/config"
-	"github.com/rocket-pool/smartnode/shared/services/rocketpool"
-	"github.com/rocket-pool/smartnode/shared/types/api"
 	"github.com/rocket-pool/smartnode/shared/utils/cli/prompt"
-	hexutils "github.com/rocket-pool/smartnode/shared/utils/hex"
 )
 
 // IPInfo API
@@ -255,75 +248,3 @@ func promptTimezone() string {
 	fmt.Printf("Using timezone %s.\n", timezone)
 	return timezone
 }
-
-// Prompt for the password to a solo validator key as part of migration
-func promptForSoloKeyPassword(rp *rocketpool.Client, cfg *config.RocketPoolConfig, pubkey types.ValidatorPubkey) (string, error) {
-
-	// Check for the custom key directory
-	datapath, err := homedir.Expand(cfg.Smartnode.DataPath.Value.(string))
-	if err != nil {
-		return "", fmt.Errorf("error expanding data directory: %w", err)
-	}
-	customKeyDir := filepath.Join(datapath, "custom-keys")
-	info, err := os.Stat(customKeyDir)
-	if os.IsNotExist(err) || !info.IsDir() {
-		return "", nil
-	}
-
-	// Get the custom keystore files
-	files, err := os.ReadDir(customKeyDir)
-	if err != nil {
-		return "", fmt.Errorf("error enumerating custom keystores: %w", err)
-	}
-	if len(files) == 0 {
-		return "", nil
-	}
-
-	// Get the pubkeys for the custom keystores
-	pubkeyPasswords := map[string]string{}
-	for _, file := range files {
-		// Read the file
-		bytes, err := os.ReadFile(filepath.Join(customKeyDir, file.Name()))
-		if err != nil {
-			return "", fmt.Errorf("error reading custom keystore %s: %w", file.Name(), err)
-		}
-
-		// Deserialize it
-		keystore := api.ValidatorKeystore{}
-		err = json.Unmarshal(bytes, &keystore)
-		if err != nil {
-			return "", fmt.Errorf("error deserializing custom keystore %s: %w", file.Name(), err)
-		}
-
-		if keystore.Pubkey == pubkey {
-			// Found it, prompt for the password
-			password := prompt.PromptPassword(
-				fmt.Sprintf("Please enter the password that the keystore for %s was encrypted with:", pubkey.Hex()), "^.*$", "",
-			)
-
-			formattedPubkey := strings.ToUpper(hexutils.RemovePrefix(pubkey.Hex()))
-			pubkeyPasswords[formattedPubkey] = password
-
-			fmt.Println()
-			break
-		}
-	}
-
-	if len(pubkeyPasswords) == 0 {
-		return "", fmt.Errorf("couldn't find the keystore for validator %s in the custom-keys directory; if you want to import this key into the Smart Node stack, you will need to put its keystore file into custom-keys first", pubkey.String())
-	}
-
-	// Store it in the file
-	fileBytes, err := yaml.Marshal(pubkeyPasswords)
-	if err != nil {
-		return "", fmt.Errorf("error serializing keystore passwords file: %w", err)
-	}
-	passwordFile := filepath.Join(datapath, "custom-key-passwords")
-	err = os.WriteFile(passwordFile, fileBytes, 0600)
-	if err != nil {
-		return "", fmt.Errorf("error writing keystore passwords file: %w", err)
-	}
-
-	return passwordFile, nil
-
-}

rocketpool-cli/node/utils.go

@@ -3,10 +3,8 @@ package pdao
 import (
 	"fmt"
 	"math/big"
-	"strings"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
 	"github.com/rocket-pool/smartnode/bindings/settings/protocol"
 	"github.com/rocket-pool/smartnode/bindings/utils/eth"
 
@@ -318,15 +316,6 @@ func proposeSettingSecurityProposalActionTime(value time.Duration, yes bool) err
 	return proposeSetting(protocol.SecuritySettingsContractName, protocol.SecurityProposalActionTimeSettingPath, trueValue, yes)
 }
 
-func proposeSettingNetworkAllowListedControllers(value []common.Address, yes bool) error {
-	strs := make([]string, len(value))
-	for i, addr := range value {
-		strs[i] = addr.Hex()
-	}
-	trueValue := strings.Join(strs, "")
-	return proposeSetting(protocol.NetworkSettingsContractName, protocol.NetworkAllowListedControllersPath, trueValue, yes)
-}
-
 func proposeSettingMegapoolTimeBeforeDissolve(value time.Duration, yes bool) error {
 	trueValue := fmt.Sprint(uint64(value.Seconds()))
 	return proposeSetting(protocol.MegapoolSettingsContractName, protocol.MegapoolTimeBeforeDissolveSettingsPath, trueValue, yes)

rocketpool-cli/pdao/propose-settings.go

@@ -11,17 +11,14 @@ const addonPageID string = "addons"
 
 // The addons page
 type AddonsPage struct {
-	home             *settingsHome
-	page             *page
-	layout           *standardLayout
-	masterConfig     *config.RocketPoolConfig
-	gwwPage          *AddonGwwPage
-	gwwButton        *parameterizedFormItem
-	rescueNodePage   *AddonRescueNodePage
-	rescueNodeButton *parameterizedFormItem
-	categoryList     *tview.List
-	addonSubpages    []settingsPage
-	content          tview.Primitive
+	home           *settingsHome
+	page           *page
+	layout         *standardLayout
+	masterConfig   *config.RocketPoolConfig
+	gwwPage        *AddonGwwPage
+	rescueNodePage *AddonRescueNodePage
+	categoryList   *tview.List
+	addonSubpages  []settingsPage
 }
 
 // Create a new addons page

rocketpool-cli/service/config/addons.go

@@ -16,21 +16,6 @@ type parameterizedFormItem struct {
 	item      tview.FormItem
 }
 
-func registerEnableCheckbox(param *cfgtypes.Parameter, checkbox *tview.Checkbox, form *Form, items []*parameterizedFormItem) {
-	checkbox.SetChangedFunc(func(checked bool) {
-		param.Value = checked
-
-		if !checked {
-			form.Clear(true)
-			form.AddFormItem(checkbox)
-		} else {
-			for _, item := range items {
-				form.AddFormItem(item.item)
-			}
-		}
-	})
-}
-
 // Create a list of form items based on a set of parameters
 func createParameterizedFormItems(params []*cfgtypes.Parameter, descriptionBox *tview.TextView) []*parameterizedFormItem {
 	formItems := []*parameterizedFormItem{}

rocketpool-cli/service/config/config-form.go

@@ -36,12 +36,6 @@ type Pseudomodal struct {
 
 	// The currently selected form (for vertical layouts)
 	selected int
-
-	// A fixed width for the description box (0 for auto)
-	descriptionWidth int
-
-	// The collection of descriptions for each button, to be displayed in the description box
-	buttonDescriptions []string
 }
 
 // NewPseudomodal returns a new modal message window.