CI: fix some more linter advice for old code

agreement/persistence.go

@@ -107,8 +107,8 @@ func persist(log serviceLogger, crash db.Accessor, Round basics.Round, Period pe
 	}()
 
 	err = crash.Atomic(func(ctx context.Context, tx *sql.Tx) error {
-		_, err := tx.Exec("insert or replace into Service (rowid, data) values (1, ?)", raw)
-		return err
+		_, err1 := tx.Exec("insert or replace into Service (rowid, data) values (1, ?)", raw)
+		return err1
 	})
 	if err == nil {
 		return

agreement/state_machine_test.go

@@ -231,7 +231,7 @@ func (w ioPropWrapper) containsTrace(trace ioTrace) (contains bool, info string,
 	for _, e := range trace.events {
 		valid := checker.addEvent(e)
 		if valid != nil {
-			return false, valid.Error(), nil
+			return false, valid.Error(), nil //nolint:nilerr // intentional
 		}
 	}
 	return true, "", nil

catchup/catchpointService.go

@@ -552,7 +552,7 @@ func (cs *CatchpointCatchupService) processStageBlocksDownload() (err error) {
 	var blk *bookkeeping.Block
 	var cert *agreement.Certificate
 	for retryCount := uint64(1); blocksFetched <= lookback; {
-		if err := cs.ctx.Err(); err != nil {
+		if err1 := cs.ctx.Err(); err1 != nil {
 			return cs.stopOrAbort()
 		}
 

catchup/universalFetcher.go

@@ -253,14 +253,14 @@ func (hf *HTTPFetcher) getBlockBytes(ctx context.Context, r basics.Round) (data
 		}
 		return nil, noBlockErr
 	default:
-		bodyBytes, err := rpcs.ResponseBytes(response, hf.log, fetcherMaxBlockBytes)
+		bodyBytes, err1 := rpcs.ResponseBytes(response, hf.log, fetcherMaxBlockBytes)
 		hf.log.Warnf("HTTPFetcher.getBlockBytes: response status code %d from '%s'. Response body '%s' ", response.StatusCode, blockURL, string(bodyBytes))
-		if err == nil {
-			err = makeErrHTTPResponse(response.StatusCode, blockURL, fmt.Sprintf("Response body '%s'", string(bodyBytes)))
+		if err1 == nil {
+			err1 = makeErrHTTPResponse(response.StatusCode, blockURL, fmt.Sprintf("Response body '%s'", string(bodyBytes)))
 		} else {
-			err = makeErrHTTPResponse(response.StatusCode, blockURL, err.Error())
+			err1 = makeErrHTTPResponse(response.StatusCode, blockURL, err1.Error())
 		}
-		return nil, err
+		return nil, err1
 	}
 
 	// at this point, we've already receieved the response headers. ensure that the

cmd/algod/main.go

@@ -137,7 +137,7 @@ func run() int {
 	}
 
 	// If data directory doesn't exist, we can't run. Don't bother trying.
-	if _, err := os.Stat(absolutePath); err != nil {
+	if _, err1 := os.Stat(absolutePath); err1 != nil {
 		fmt.Fprintf(os.Stderr, "Data directory %s does not appear to be valid\n", dataDir)
 		return 1
 	}
@@ -215,12 +215,12 @@ func run() int {
 	isTest := os.Getenv("ALGOTEST") != ""
 	remoteTelemetryEnabled := false
 	if !isTest {
-		telemetryConfig, err := logging.EnsureTelemetryConfig(&dataDir, genesis.ID())
-		if err != nil {
-			fmt.Fprintln(os.Stdout, "error loading telemetry config", err)
+		telemetryConfig, err1 := logging.EnsureTelemetryConfig(&dataDir, genesis.ID())
+		if err1 != nil {
+			fmt.Fprintln(os.Stdout, "error loading telemetry config", err1)
 		}
-		if os.IsPermission(err) {
-			fmt.Fprintf(os.Stderr, "Permission error on accessing telemetry config: %v", err)
+		if os.IsPermission(err1) {
+			fmt.Fprintf(os.Stderr, "Permission error on accessing telemetry config: %v", err1)
 			return 1
 		}
 		fmt.Fprintf(os.Stdout, "Telemetry configured from '%s'\n", telemetryConfig.FilePath)
@@ -240,23 +240,23 @@ func run() int {
 			}
 			// Try to enable remote telemetry now when URI is defined. Skip for DNS based telemetry.
 			ctx, telemetryCancelFn := context.WithTimeout(context.Background(), defaultStaticTelemetryStartupTimeout)
-			err = log.EnableTelemetryContext(ctx, telemetryConfig)
+			err1 = log.EnableTelemetryContext(ctx, telemetryConfig)
 			telemetryCancelFn()
-			if err != nil {
-				fmt.Fprintln(os.Stdout, "error creating telemetry hook", err)
+			if err1 != nil {
+				fmt.Fprintln(os.Stdout, "error creating telemetry hook", err1)
 
 				// Remote telemetry init loop
 				go func() {
 					for {
 						time.Sleep(defaultStaticTelemetryBGDialRetry)
 						// Try to enable remote telemetry now when URI is defined. Skip for DNS based telemetry.
-						err := log.EnableTelemetryContext(context.Background(), telemetryConfig)
+						err1 := log.EnableTelemetryContext(context.Background(), telemetryConfig)
 						// Error occurs only if URI is defined and we need to retry later
-						if err == nil {
+						if err1 == nil {
 							// Remote telemetry enabled or empty static URI, stop retrying
 							return
 						}
-						fmt.Fprintln(os.Stdout, "error creating telemetry hook", err)
+						fmt.Fprintln(os.Stdout, "error creating telemetry hook", err1)
 						// Try to reenable every minute
 					}
 				}()
@@ -343,18 +343,18 @@ func run() int {
 	if peerOverrideArray != nil {
 		phonebookAddresses = peerOverrideArray
 	} else {
-		ex, err := os.Executable()
-		if err != nil {
-			log.Errorf("cannot locate node executable: %s", err)
+		ex, err1 := os.Executable()
+		if err1 != nil {
+			log.Errorf("cannot locate node executable: %s", err1)
 		} else {
 			phonebookDirs := []string{filepath.Dir(ex), dataDir}
 			for _, phonebookDir := range phonebookDirs {
-				phonebookAddresses, err = config.LoadPhonebook(phonebookDir)
-				if err == nil {
+				phonebookAddresses, err1 = config.LoadPhonebook(phonebookDir)
+				if err1 == nil {
 					log.Debugf("Static phonebook loaded from %s", phonebookDir)
 					break
 				} else {
-					log.Debugf("Cannot load static phonebook from %s dir: %v", phonebookDir, err)
+					log.Debugf("Cannot load static phonebook from %s dir: %v", phonebookDir, err1)
 				}
 			}
 		}

cmd/algofix/main.go

@@ -162,18 +162,18 @@ func processFile(filename string, useStdin bool) error {
 			// AST changed.
 			// Print and parse, to update any missing scoping
 			// or position information for subsequent fixers.
-			newSrc, err := gofmtFile(newFile)
-			if err != nil {
-				return err
+			newSrc, err1 := gofmtFile(newFile)
+			if err1 != nil {
+				return err1
 			}
-			newFile, err = parser.ParseFile(fset, filename, newSrc, parserMode)
-			if err != nil {
+			newFile, err1 = parser.ParseFile(fset, filename, newSrc, parserMode)
+			if err1 != nil {
 				if debug {
 					fmt.Printf("%s", newSrc)
-					report(err)
+					report(err1)
 					os.Exit(exitCode)
 				}
-				return err
+				return err1
 			}
 		}
 	}

cmd/algoh/main.go

@@ -116,7 +116,7 @@ func main() {
 		log.Fatalf("Error validating DNSBootstrap input: %v", err)
 	}
 
-	if _, err := os.Stat(absolutePath); err != nil {
+	if _, err1 := os.Stat(absolutePath); err1 != nil {
 		reportErrorf("Data directory %s does not appear to be valid\n", dataDir)
 	}
 

cmd/algokey/multisig.go

@@ -85,15 +85,15 @@ var multisigCmd = &cobra.Command{
 			}
 
 			ver, thresh, pks := stxn.Msig.Preimage()
-			addr, err := crypto.MultisigAddrGen(ver, thresh, pks)
-			if err != nil {
-				fmt.Fprintf(os.Stderr, "Cannot generate multisig addr: %v\n", err)
+			addr, err1 := crypto.MultisigAddrGen(ver, thresh, pks)
+			if err1 != nil {
+				fmt.Fprintf(os.Stderr, "Cannot generate multisig addr: %v\n", err1)
 				os.Exit(1)
 			}
 
-			stxn.Msig, err = crypto.MultisigSign(stxn.Txn, addr, ver, thresh, pks, *key)
-			if err != nil {
-				fmt.Fprintf(os.Stderr, "Cannot add multisig signature: %v\n", err)
+			stxn.Msig, err1 = crypto.MultisigSign(stxn.Txn, addr, ver, thresh, pks, *key)
+			if err1 != nil {
+				fmt.Fprintf(os.Stderr, "Cannot add multisig signature: %v\n", err1)
 				os.Exit(1)
 			}
 
@@ -147,9 +147,9 @@ var appendAuthAddrCmd = &cobra.Command{
 		// Convert the addresses into public keys
 		pks := make([]crypto.PublicKey, len(params[1:]))
 		for i, addrStr := range params[1:] {
-			addr, err := basics.UnmarshalChecksumAddress(addrStr)
-			if err != nil {
-				fmt.Fprintf(os.Stderr, "Cannot decode address: %v\n", err)
+			addr, err1 := basics.UnmarshalChecksumAddress(addrStr)
+			if err1 != nil {
+				fmt.Fprintf(os.Stderr, "Cannot decode address: %v\n", err1)
 				os.Exit(1)
 			}
 			pks[i] = crypto.PublicKey(addr)

cmd/algons/dnsCmd.go

@@ -348,13 +348,13 @@ func doDeleteDNS(network string, noPrompt bool, excludePattern string, includePa
 			name = service + "._tcp." + network + ".algodev.network"
 		}
 
-		records, err := cloudflareDNS.ListDNSRecord(context.Background(), "SRV", name, "", "", "", "")
+		records, err1 := cloudflareDNS.ListDNSRecord(context.Background(), "SRV", name, "", "", "", "")
 
-		if err != nil {
+		if err1 != nil {
 			if name != "" {
-				fmt.Fprintf(os.Stderr, "Error listing SRV '%s' entries: %v\n", service, err)
+				fmt.Fprintf(os.Stderr, "Error listing SRV '%s' entries: %v\n", service, err1)
 			} else {
-				fmt.Fprintf(os.Stderr, "Error listing SRV entries: %v\n", err)
+				fmt.Fprintf(os.Stderr, "Error listing SRV entries: %v\n", err1)
 			}
 			os.Exit(1)
 		}
@@ -381,9 +381,9 @@ func doDeleteDNS(network string, noPrompt bool, excludePattern string, includePa
 	}
 
 	for _, recordType := range []string{"A", "CNAME", "TXT"} {
-		records, err := cloudflareDNS.ListDNSRecord(context.Background(), recordType, "", "", "", "", "")
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "Error listing DNS '%s' entries: %v\n", recordType, err)
+		records, err1 := cloudflareDNS.ListDNSRecord(context.Background(), recordType, "", "", "", "", "")
+		if err1 != nil {
+			fmt.Fprintf(os.Stderr, "Error listing DNS '%s' entries: %v\n", recordType, err1)
 			os.Exit(1)
 		}
 		for _, r := range records {

cmd/buildtools/genesis.go

@@ -179,15 +179,15 @@ var ensureCmd = &cobra.Command{
 
 		if createRelease {
 			// In case we're creating first one for network, ensure output directory exists
-			err := os.MkdirAll(releaseNetworkDir, os.ModeDir|os.FileMode(0777))
-			if err != nil {
-				reportErrorf("Error creating release genesis output directory '%s': %v\n", releaseNetworkDir, err)
+			err1 := os.MkdirAll(releaseNetworkDir, os.ModeDir|os.FileMode(0777))
+			if err1 != nil {
+				reportErrorf("Error creating release genesis output directory '%s': %v\n", releaseNetworkDir, err1)
 			}
 
 			// Make sure release genesis file exists and if it does, the hash matches its computed hash
-			err = ensureReleaseGenesis(sourceGenesis, releaseFile)
-			if err != nil {
-				reportErrorf("Error ensuring release genesis file '%s': %v\n", releaseFile, err)
+			err1 = ensureReleaseGenesis(sourceGenesis, releaseFile)
+			if err1 != nil {
+				reportErrorf("Error ensuring release genesis file '%s': %v\n", releaseFile, err1)
 			}
 		} else {
 			// If the target network is custom (not well-known), don't bother with release genesis file

cmd/catchpointdump/file.go

@@ -424,17 +424,17 @@ func loadCatchpointIntoDatabase(ctx context.Context, catchupAccessor ledger.Catc
 		readComplete := int64(0)
 
 		for readComplete < header.Size {
-			bytesRead, err := tarReader.Read(balancesBlockBytes[readComplete:])
+			bytesRead, err1 := tarReader.Read(balancesBlockBytes[readComplete:])
 			readComplete += int64(bytesRead)
 			progress += uint64(bytesRead)
-			if err != nil {
-				if err == io.EOF {
+			if err1 != nil {
+				if err1 == io.EOF {
 					if readComplete == header.Size {
 						break
 					}
-					err = fmt.Errorf("getPeerLedger received io.EOF while reading from tar file stream prior of reaching chunk size %d / %d", readComplete, header.Size)
+					err1 = fmt.Errorf("getPeerLedger received io.EOF while reading from tar file stream prior of reaching chunk size %d / %d", readComplete, header.Size)
 				}
-				return fileHeader, err
+				return fileHeader, err1
 			}
 		}
 		err = catchupAccessor.ProcessStagingBalances(ctx, header.Name, balancesBlockBytes, &downloadProgress)

cmd/diagcfg/telemetry.go

@@ -72,21 +72,21 @@ func saveTelemetryConfig(cfg logging.TelemetryConfig) {
 	if dataDir != "" {
 		// Save to dataDir and only update global config {Name,GUID}
 		ddPath := filepath.Join(dataDir, logging.TelemetryConfigFilename)
-		err := cfg.Save(ddPath)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, pathErrFormat, ddPath, err)
+		err1 := cfg.Save(ddPath)
+		if err1 != nil {
+			fmt.Fprintf(os.Stderr, pathErrFormat, ddPath, err1)
 			os.Exit(1)
 		}
-		gcfg, err := logging.LoadTelemetryConfig(globalPath)
-		if err != nil && !os.IsNotExist(err) {
-			fmt.Fprintf(os.Stderr, pathErrFormat, globalPath, err)
+		gcfg, err1 := logging.LoadTelemetryConfig(globalPath)
+		if err1 != nil && !os.IsNotExist(err1) {
+			fmt.Fprintf(os.Stderr, pathErrFormat, globalPath, err1)
 			os.Exit(1)
 		}
 		gcfg.Name = cfg.Name
 		gcfg.GUID = cfg.GUID
-		err = gcfg.Save(globalPath)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, pathErrFormat, globalPath, err)
+		err1 = gcfg.Save(globalPath)
+		if err1 != nil {
+			fmt.Fprintf(os.Stderr, pathErrFormat, globalPath, err1)
 			os.Exit(1)
 		}
 	} else {

cmd/goal/account.go

@@ -921,14 +921,14 @@ var changeOnlineCmd = &cobra.Command{
 
 		firstTxRound, lastTxRound, _, err := client.ComputeValidityRounds(firstValid, lastValid, numValidRounds)
 		if err != nil {
-			reportErrorf(err.Error())
+			reportErrorln(err.Error())
 		}
 		err = changeAccountOnlineStatus(
 			accountAddress, online, statusChangeTxFile, walletName,
 			firstTxRound, lastTxRound, transactionFee, scLeaseBytes(cmd), dataDir, client,
 		)
 		if err != nil {
-			reportErrorf(err.Error())
+			reportErrorln(err.Error())
 		}
 	},
 }
@@ -1097,7 +1097,7 @@ var renewParticipationKeyCmd = &cobra.Command{
 
 		err = generateAndRegisterPartKey(accountAddress, currentRound, roundLastValid, txRoundLastValid, transactionFee, scLeaseBytes(cmd), keyDilution, walletName, dataDir, client)
 		if err != nil {
-			reportErrorf(err.Error())
+			reportErrorln(err.Error())
 		}
 
 		version := config.GetCurrentVersion()

cmd/goal/application.go

@@ -495,9 +495,9 @@ var createAppCmd = &cobra.Command{
 			reportInfof("Issued transaction from account %s, txid %s (fee %d)", tx.Sender, txid, tx.Fee.Raw)
 
 			if !noWaitAfterSend {
-				txn, err := waitForCommit(client, txid, lv)
-				if err != nil {
-					reportErrorf(err.Error())
+				txn, err1 := waitForCommit(client, txid, lv)
+				if err1 != nil {
+					reportErrorln(err1.Error())
 				}
 				if txn.ApplicationIndex != nil && *txn.ApplicationIndex != 0 {
 					reportInfof("Created app with app index %d", *txn.ApplicationIndex)