Enable and fix ineffassign issues

Author: jshufro

.github/workflows/lint.yml

@@ -35,7 +35,7 @@ jobs:
           # args: --issues-exit-code=0
 
           # For now, Smart Node will only enforce goimports linting
-          args: --disable-all --enable goimports --enable staticcheck
+          args: --disable-all --enable goimports --enable staticcheck --enable ineffassign
 
           # Optional: show only new issues if it's a pull request. The default value is `false`.
           # only-new-issues: true

rocketpool-cli/commands/node/utils.go

@@ -197,7 +197,6 @@ func promptTimezone() string {
 	// Prompt for country
 	country := ""
 	for {
-		timezone = ""
 		country = utils.Prompt("Please enter a country / continent from the list above:", "^.+$", "Please enter a country / continent from the list above:")
 
 		exists := false
@@ -257,7 +256,6 @@ func promptTimezone() string {
 	// Prompt for region
 	region := ""
 	for {
-		timezone = ""
 		region = utils.Prompt("Please enter a region from the list above:", "^.+$", "Please enter a region from the list above:")
 
 		exists := false

rocketpool-cli/commands/odao/proposals.go

@@ -92,9 +92,8 @@ func getProposals(c *cli.Context, stateFilter string) error {
 				if bytes.Equal(proposal.ProposerAddress.Bytes(), member.Address.Bytes()) {
 					fmt.Printf("%d: %s - Proposed by: %s (%s)\n", proposal.ID, proposal.Message, member.ID, proposal.ProposerAddress)
 					printed = true
+					break
 				}
-				printed = true
-				break
 			}
 			if !printed {
 				fmt.Printf("%d: %s - Proposed by: %s (no longer on the Oracle DAO)\n", proposal.ID, proposal.Message, proposal.ProposerAddress)

rocketpool-daemon/common/state/network-state.go

@@ -337,7 +337,8 @@ func CreateNetworkStateForNode(cfg *config.SmartNodeConfig, rp *rocketpool.Rocke
 		return nil, nil, fmt.Errorf("error getting Protocol DAO proposal details: %w", err)
 	}
 	logger.Info(fmt.Sprintf("%d/%d - Retrieved Protocol DAO proposals", currentStep, steps), slog.Duration(keys.TotalElapsedKey, time.Since(start)))
-	currentStep++
+	// If adding more steps below, don't forget to increment currentStep:
+	// currentStep++
 
 	return state, totalEffectiveStake, nil
 }

rocketpool-daemon/node/collectors/supply-collector.go

@@ -86,7 +86,6 @@ func (c *SupplyCollector) Collect(channel chan<- prometheus.Metric) {
 	}
 
 	// Sync
-	nodeCount := float64(-1)
 	nodeFee := state.NetworkDetails.NodeFee
 	initializedCount := float64(-1)
 	prelaunchCount := float64(-1)
@@ -95,7 +94,7 @@ func (c *SupplyCollector) Collect(channel chan<- prometheus.Metric) {
 	finalizedCount := float64(-1)
 
 	// Get total number of Rocket Pool nodes
-	nodeCount = float64(len(state.NodeDetails))
+	nodeCount := float64(len(state.NodeDetails))
 
 	// Get the total number of Rocket Pool minipools
 	for _, mpd := range state.MinipoolDetails {