diff --git a/agreement/persistence.go b/agreement/persistence.go index ba2b05a006..4bcda1c5bd 100644 --- a/agreement/persistence.go +++ b/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 diff --git a/agreement/state_machine_test.go b/agreement/state_machine_test.go index 73bd279672..189ae432c7 100644 --- a/agreement/state_machine_test.go +++ b/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 diff --git a/catchup/catchpointService.go b/catchup/catchpointService.go index 422c30b28d..b1a3def2d0 100644 --- a/catchup/catchpointService.go +++ b/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() } diff --git a/catchup/universalFetcher.go b/catchup/universalFetcher.go index 4d03df6e5a..d7089a4256 100644 --- a/catchup/universalFetcher.go +++ b/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 diff --git a/cmd/algod/main.go b/cmd/algod/main.go index f50dc00f77..774d5c7d67 100644 --- a/cmd/algod/main.go +++ b/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) } } } diff --git a/cmd/algofix/main.go b/cmd/algofix/main.go index 09df524928..d3bb997c3d 100644 --- a/cmd/algofix/main.go +++ b/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 } } } diff --git a/cmd/algoh/main.go b/cmd/algoh/main.go index 9cab7214b3..8d290d9a31 100644 --- a/cmd/algoh/main.go +++ b/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) } diff --git a/cmd/algokey/multisig.go b/cmd/algokey/multisig.go index bd615857a8..66322f4ed9 100644 --- a/cmd/algokey/multisig.go +++ b/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) diff --git a/cmd/algons/dnsCmd.go b/cmd/algons/dnsCmd.go index 9f432e76b1..971578e2d3 100644 --- a/cmd/algons/dnsCmd.go +++ b/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 { diff --git a/cmd/buildtools/genesis.go b/cmd/buildtools/genesis.go index 631bb6230d..794d22d1b0 100644 --- a/cmd/buildtools/genesis.go +++ b/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 diff --git a/cmd/catchpointdump/file.go b/cmd/catchpointdump/file.go index 31e27c1662..e79a86bce1 100644 --- a/cmd/catchpointdump/file.go +++ b/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) diff --git a/cmd/diagcfg/telemetry.go b/cmd/diagcfg/telemetry.go index 900f4227d5..8ceae0017d 100644 --- a/cmd/diagcfg/telemetry.go +++ b/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 { diff --git a/cmd/goal/account.go b/cmd/goal/account.go index 794d646ef3..2fa9709961 100644 --- a/cmd/goal/account.go +++ b/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() diff --git a/cmd/goal/application.go b/cmd/goal/application.go index 0735043c8f..b0314918d6 100644 --- a/cmd/goal/application.go +++ b/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) diff --git a/cmd/goal/asset.go b/cmd/goal/asset.go index 1625b13676..d76ffc5b96 100644 --- a/cmd/goal/asset.go +++ b/cmd/goal/asset.go @@ -321,9 +321,9 @@ var createAssetCmd = &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.AssetIndex != nil && *txn.AssetIndex != 0 { reportInfof("Created asset with asset index %d", *txn.AssetIndex) @@ -332,7 +332,7 @@ var createAssetCmd = &cobra.Command{ } else { err = writeTxnToFile(client, sign, dataDir, walletName, tx, outFilename) if err != nil { - reportErrorf(err.Error()) + reportErrorln(err.Error()) } } }, @@ -408,7 +408,7 @@ var destroyAssetCmd = &cobra.Command{ } else { err = writeTxnToFile(client, sign, dataDir, walletName, tx, outFilename) if err != nil { - reportErrorf(err.Error()) + reportErrorln(err.Error()) } } }, @@ -501,7 +501,7 @@ var configAssetCmd = &cobra.Command{ } else { err = writeTxnToFile(client, sign, dataDir, walletName, tx, outFilename) if err != nil { - reportErrorf(err.Error()) + reportErrorln(err.Error()) } } }, @@ -588,7 +588,7 @@ var sendAssetCmd = &cobra.Command{ } else { err = writeTxnToFile(client, sign, dataDir, walletName, tx, outFilename) if err != nil { - reportErrorf(err.Error()) + reportErrorln(err.Error()) } } }, @@ -657,7 +657,7 @@ var freezeAssetCmd = &cobra.Command{ } else { err = writeTxnToFile(client, sign, dataDir, walletName, tx, outFilename) if err != nil { - reportErrorf(err.Error()) + reportErrorln(err.Error()) } } }, diff --git a/cmd/goal/clerk.go b/cmd/goal/clerk.go index 165c37ed9c..7ac1db31e2 100644 --- a/cmd/goal/clerk.go +++ b/cmd/goal/clerk.go @@ -408,16 +408,16 @@ var sendCmd = &cobra.Command{ // (we don't use accountList.getAddressByName because this address likely doesn't correspond to an account) var rekeyTo basics.Address if rekeyToAddress != "" { - var err error - rekeyTo, err = basics.UnmarshalChecksumAddress(rekeyToAddress) - if err != nil { - reportErrorf(err.Error()) + var err1 error + rekeyTo, err1 = basics.UnmarshalChecksumAddress(rekeyToAddress) + if err1 != nil { + reportErrorln(err1.Error()) } } client := ensureFullClient(dataDir) firstValid, lastValid, _, err = client.ComputeValidityRounds(firstValid, lastValid, numValidRounds) if err != nil { - reportErrorf(err.Error()) + reportErrorln(err.Error()) } payment, err := client.ConstructPayment( fromAddressResolved, toAddressResolved, fee, amount, noteBytes, closeToAddressResolved, @@ -449,9 +449,9 @@ var sendCmd = &cobra.Command{ var stx transactions.SignedTxn if lsig.Logic != nil { - params, err := client.SuggestedParams() - if err != nil { - reportErrorf(errorNodeStatus, err) + params, err1 := client.SuggestedParams() + if err1 != nil { + reportErrorf(errorNodeStatus, err1) } proto := protocol.ConsensusVersion(params.ConsensusVersion) uncheckedTxn := transactions.SignedTxn{ @@ -463,12 +463,12 @@ var sendCmd = &cobra.Command{ CurrentProtocol: proto, }, } - groupCtx, err := verify.PrepareGroupContext([]transactions.SignedTxn{uncheckedTxn}, &blockHeader, nil, nil) - if err == nil { - err = verify.LogicSigSanityCheck(0, groupCtx) + groupCtx, err1 := verify.PrepareGroupContext([]transactions.SignedTxn{uncheckedTxn}, &blockHeader, nil, nil) + if err1 == nil { + err1 = verify.LogicSigSanityCheck(0, groupCtx) } - if err != nil { - reportErrorf("%s: txn error %s", outFilename, err) + if err1 != nil { + reportErrorf("%s: txn error %s", outFilename, err1) } stx = uncheckedTxn } else if program != nil { @@ -501,24 +501,24 @@ var sendCmd = &cobra.Command{ reportErrorf(msigParseError, "Not enough arguments to create the multisig address.\nPlease make sure to specify the threshold and at least 2 addresses\n") } - threshold, err := strconv.ParseUint(params[0], 10, 8) - if err != nil || threshold < 1 || threshold > 255 { + threshold, err1 := strconv.ParseUint(params[0], 10, 8) + if err1 != nil || threshold < 1 || threshold > 255 { reportErrorf(msigParseError, "Failed to parse the threshold. Make sure it's a number between 1 and 255") } // 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 { - reportErrorf(failDecodeAddressError, err) + addr, err2 := basics.UnmarshalChecksumAddress(addrStr) + if err2 != nil { + reportErrorf(failDecodeAddressError, err2) } pks[i] = crypto.PublicKey(addr) } - addr, err := crypto.MultisigAddrGen(1, uint8(threshold), pks) - if err != nil { - reportErrorf(msigParseError, err) + addr, err1 := crypto.MultisigAddrGen(1, uint8(threshold), pks) + if err1 != nil { + reportErrorf(msigParseError, err1) } // Generate the multisig and assign to the txn @@ -533,10 +533,10 @@ var sendCmd = &cobra.Command{ if outFilename == "" { // Broadcast the tx - txid, err := client.BroadcastTransaction(stx) + txid, err1 := client.BroadcastTransaction(stx) - if err != nil { - reportErrorf(errorBroadcastingTX, err) + if err1 != nil { + reportErrorf(errorBroadcastingTX, err1) } // update information from Transaction @@ -546,9 +546,9 @@ var sendCmd = &cobra.Command{ reportInfof(infoTxIssued, amount, fromAddressResolved, toAddressResolved, txid, fee) if !noWaitAfterSend { - _, err = waitForCommit(client, txid, lastValid) - if err != nil { - reportErrorf(err.Error()) + _, err1 = waitForCommit(client, txid, lastValid) + if err1 != nil { + reportErrorln(err1.Error()) } } } else { @@ -609,12 +609,12 @@ var rawsendCmd = &cobra.Command{ pendingTxns := make(map[transactions.Txid]string) for _, txgroup := range txgroups { // Broadcast the transaction - err := client.BroadcastTransactionGroup(txgroup) - if err != nil { + err1 := client.BroadcastTransactionGroup(txgroup) + if err1 != nil { for _, txn := range txgroup { - txnErrors[txn.ID()] = err.Error() + txnErrors[txn.ID()] = err1.Error() } - reportWarnf(errorBroadcastingTX, err) + reportWarnf(errorBroadcastingTX, err1) continue } @@ -1162,7 +1162,7 @@ var dryrunCmd = &cobra.Command{ } data, err := libgoal.MakeDryrunStateBytes(client, nil, stxns, accts, string(proto), dumpForDryrunFormat.String()) if err != nil { - reportErrorf(err.Error()) + reportErrorln(err.Error()) } writeFile(outFilename, data, 0600) return diff --git a/cmd/goal/commands.go b/cmd/goal/commands.go index 707d3ccc14..819f89a104 100644 --- a/cmd/goal/commands.go +++ b/cmd/goal/commands.go @@ -361,9 +361,9 @@ func getWalletHandleMaybePassword(dataDir string, walletName string, getPassword if len(walletID) == 0 { // If we still don't have a default, check if there's only one wallet. // If there is, make it the default and continue - wallets, err := kmd.ListWallets() - if err != nil { - return nil, nil, fmt.Errorf(errCouldNotListWallets, err) + wallets, err1 := kmd.ListWallets() + if err1 != nil { + return nil, nil, fmt.Errorf(errCouldNotListWallets, err1) } if len(wallets) == 1 { // Only one wallet, so it's unambigious diff --git a/cmd/goal/interact.go b/cmd/goal/interact.go index 32198de3de..306445a2bd 100644 --- a/cmd/goal/interact.go +++ b/cmd/goal/interact.go @@ -630,9 +630,9 @@ var appExecuteCmd = &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) @@ -642,7 +642,7 @@ var appExecuteCmd = &cobra.Command{ // Broadcast or write transaction to file err = writeTxnToFile(client, sign, dataDir, walletName, tx, outFilename) if err != nil { - reportErrorf(err.Error()) + reportErrorln(err.Error()) } } }, diff --git a/cmd/goal/multisig.go b/cmd/goal/multisig.go index cacff18fcd..3b85ba6ac2 100644 --- a/cmd/goal/multisig.go +++ b/cmd/goal/multisig.go @@ -109,13 +109,13 @@ var addSigCmd = &cobra.Command{ var msig crypto.MultisigSig if noSig { - multisigInfo, err := client.LookupMultisigAccount(wh, stxn.Txn.Sender.String()) - if err != nil { - reportErrorf(msigLookupError, err) + multisigInfo, err1 := client.LookupMultisigAccount(wh, stxn.Txn.Sender.String()) + if err1 != nil { + reportErrorf(msigLookupError, err1) } - msig, err = msigInfoToMsig(multisigInfo) - if err != nil { - reportErrorf(msigParseError, err) + msig, err1 = msigInfoToMsig(multisigInfo) + if err1 != nil { + reportErrorf(msigParseError, err1) } } else { if stxn.AuthAddr.IsZero() { diff --git a/cmd/goal/tealsign.go b/cmd/goal/tealsign.go index 0663771655..bfbad5d526 100644 --- a/cmd/goal/tealsign.go +++ b/cmd/goal/tealsign.go @@ -142,9 +142,9 @@ The base64 encoding of the signature will always be printed to stdout. Optionall progHash = logic.HashProgram(stxn.Lsig.Logic) } else { // Otherwise, the contract address is the logic hash - parsedAddr, err := basics.UnmarshalChecksumAddress(contractAddr) - if err != nil { - reportErrorf(tealsignParseAddr, err) + parsedAddr, err1 := basics.UnmarshalChecksumAddress(contractAddr) + if err1 != nil { + reportErrorf(tealsignParseAddr, err1) } // Copy parsed address as program hash diff --git a/cmd/goal/wallet.go b/cmd/goal/wallet.go index 8bc1b427c8..5dadd597c9 100644 --- a/cmd/goal/wallet.go +++ b/cmd/goal/wallet.go @@ -101,15 +101,15 @@ var newWalletCmd = &cobra.Command{ var mdk crypto.MasterDerivationKey if recoverWallet { fmt.Println(infoRecoveryPrompt) - resp, err := reader.ReadString('\n') + resp, err1 := reader.ReadString('\n') resp = strings.TrimSpace(resp) - if err != nil { - reportErrorf(errorFailedToReadResponse, err) + if err1 != nil { + reportErrorf(errorFailedToReadResponse, err1) } var key []byte - key, err = passphrase.MnemonicToKey(resp) - if err != nil { - reportErrorf(errorBadMnemonic, err) + key, err1 = passphrase.MnemonicToKey(resp) + if err1 != nil { + reportErrorf(errorBadMnemonic, err1) } // Copy the recovered key into the mdk n := copy(mdk[:], key) @@ -148,32 +148,32 @@ var newWalletCmd = &cobra.Command{ if !recoverWallet && !noDisplaySeed { // Offer to print backup seed fmt.Println(infoBackupExplanation) - resp, err := reader.ReadString('\n') + resp, err1 := reader.ReadString('\n') resp = strings.TrimSpace(resp) - if err != nil { - reportErrorf(errorFailedToReadResponse, err) + if err1 != nil { + reportErrorf(errorFailedToReadResponse, err1) } if strings.ToLower(resp) != "n" { // Get a wallet handle token - token, err := client.GetWalletHandleToken(walletID, walletPassword) - if err != nil { - reportErrorf(errorCouldntInitializeWallet, err) + token, err1 := client.GetWalletHandleToken(walletID, walletPassword) + if err1 != nil { + reportErrorf(errorCouldntInitializeWallet, err1) } // Invalidate the handle when we're done with it defer client.ReleaseWalletHandle(token) // Export the master derivation key - mdk, err := client.ExportMasterDerivationKey(token, walletPassword) - if err != nil { - reportErrorf(errorCouldntExportMDK, err) + mdk, err1 := client.ExportMasterDerivationKey(token, walletPassword) + if err1 != nil { + reportErrorf(errorCouldntExportMDK, err1) } // Convert the key to a mnemonic - mnemonic, err := passphrase.KeyToMnemonic(mdk[:]) - if err != nil { - reportErrorf(errorCouldntMakeMnemonic, err) + mnemonic, err1 := passphrase.KeyToMnemonic(mdk[:]) + if err1 != nil { + reportErrorf(errorCouldntMakeMnemonic, err1) } // Display the mnemonic to the user diff --git a/cmd/netgoal/generate.go b/cmd/netgoal/generate.go index e3188f3381..c8e44cc8b3 100644 --- a/cmd/netgoal/generate.go +++ b/cmd/netgoal/generate.go @@ -111,38 +111,38 @@ template modes for -t:`, baseRelay := remote.NodeConfig{} baseNonParticipatingNode := remote.NodeConfig{} if nodeTemplatePath != "" { - fin, err := os.Open(nodeTemplatePath) - if err != nil { - reportErrorf("%s: bad node template, %s", nodeTemplatePath, err) + fin, err1 := os.Open(nodeTemplatePath) + if err1 != nil { + reportErrorf("%s: bad node template, %s", nodeTemplatePath, err1) } dec := json.NewDecoder(fin) - err = dec.Decode(&baseNode) - if err != nil { - reportErrorf("%s: bad node template, %s", nodeTemplatePath, err) + err1 = dec.Decode(&baseNode) + if err1 != nil { + reportErrorf("%s: bad node template, %s", nodeTemplatePath, err1) } } if nonParticipatingNodeTemplatePath != "" { - fin, err := os.Open(nonParticipatingNodeTemplatePath) - if err != nil { - reportErrorf("%s: bad npnode template, %s", nonParticipatingNodeTemplatePath, err) + fin, err1 := os.Open(nonParticipatingNodeTemplatePath) + if err1 != nil { + reportErrorf("%s: bad npnode template, %s", nonParticipatingNodeTemplatePath, err1) } dec := json.NewDecoder(fin) - err = dec.Decode(&baseNonParticipatingNode) - if err != nil { - reportErrorf("%s: bad node template, %s", nodeTemplatePath, err) + err1 = dec.Decode(&baseNonParticipatingNode) + if err1 != nil { + reportErrorf("%s: bad node template, %s", nodeTemplatePath, err1) } } else { baseNonParticipatingNode = baseNode } if relayTemplatePath != "" { - fin, err := os.Open(relayTemplatePath) - if err != nil { - reportErrorf("%s: bad relay template, %s", relayTemplatePath, err) + fin, err1 := os.Open(relayTemplatePath) + if err1 != nil { + reportErrorf("%s: bad relay template, %s", relayTemplatePath, err1) } dec := json.NewDecoder(fin) - err = dec.Decode(&baseRelay) - if err != nil { - reportErrorf("%s: bad relay template, %s", relayTemplatePath, err) + err1 = dec.Decode(&baseRelay) + if err1 != nil { + reportErrorf("%s: bad relay template, %s", relayTemplatePath, err1) } } else { baseRelay = baseNode diff --git a/cmd/netgoal/network.go b/cmd/netgoal/network.go index 8638d8151f..487ac4cdcc 100644 --- a/cmd/netgoal/network.go +++ b/cmd/netgoal/network.go @@ -165,9 +165,9 @@ func runBuildNetwork() error { bootstrappedFile = resolveFile(r.BootstrappedFile, templateBaseDir) } if util.FileExists(bootstrappedFile) && bootstrapLoadingFile { - fileTemplate, err := remote.LoadBootstrappedData(bootstrappedFile) - if err != nil { - return fmt.Errorf("error resolving bootstrap file: %v", err) + fileTemplate, err1 := remote.LoadBootstrappedData(bootstrappedFile) + if err1 != nil { + return fmt.Errorf("error resolving bootstrap file: %v", err1) } net.BootstrappedNet = fileTemplate net.SetUseBootstrappedFiles(bootstrapLoadingFile) diff --git a/cmd/nodecfg/get.go b/cmd/nodecfg/get.go index df9b3ef17a..c42554da45 100644 --- a/cmd/nodecfg/get.go +++ b/cmd/nodecfg/get.go @@ -55,8 +55,8 @@ var getCmd = &cobra.Command{ reportErrorf("Target rootdir '%s' already exists", networkRootDir) } - if err := doGet(getChannel, getRootDir); err != nil { - reportErrorf("Error retrieving configuration: %v", err) + if err1 := doGet(getChannel, getRootDir); err1 != nil { + reportErrorf("Error retrieving configuration: %v", err1) } cfg, err := remote.LoadDeployedNetworkConfigFromDir(getRootDir) diff --git a/cmd/pingpong/runCmd.go b/cmd/pingpong/runCmd.go index 6a57cab766..a32c37cc88 100644 --- a/cmd/pingpong/runCmd.go +++ b/cmd/pingpong/runCmd.go @@ -280,16 +280,16 @@ var runCmd = &cobra.Command{ cfg.RandomizeDst = randomDst || cfg.RandomizeDst cfg.Quiet = quietish || cfg.Quiet if runTime != "" { - val, err := strconv.ParseUint(runTime, 10, 32) - if err != nil { - reportErrorf("Invalid value specified for --run: %v\n", err) + val, err1 := strconv.ParseUint(runTime, 10, 32) + if err1 != nil { + reportErrorf("Invalid value specified for --run: %v\n", err1) } cfg.RunTime = time.Duration(uint32(val)) * time.Second } if refreshTime != "" { - val, err := strconv.ParseUint(refreshTime, 10, 32) - if err != nil { - reportErrorf("Invalid value specified for --refresh: %v\n", err) + val, err1 := strconv.ParseUint(refreshTime, 10, 32) + if err1 != nil { + reportErrorf("Invalid value specified for --refresh: %v\n", err1) } cfg.RefreshTime = time.Duration(uint32(val)) * time.Second } @@ -311,8 +311,8 @@ var runCmd = &cobra.Command{ programStr = tealLight case "normal": programStr = tealNormal - bytes, err := base64.StdEncoding.DecodeString("iZWMx72KvU6Bw6sPAWQFL96YH+VMrBA0XKWD9XbZOZI=") - if err != nil { + bytes, err1 := base64.StdEncoding.DecodeString("iZWMx72KvU6Bw6sPAWQFL96YH+VMrBA0XKWD9XbZOZI=") + if err1 != nil { reportErrorf("Internal error, cannot decode.") } cfg.LogicArgs = [][]byte{bytes} @@ -321,8 +321,8 @@ var runCmd = &cobra.Command{ default: reportErrorf("Invalid argument for --teal: %v\n", teal) } - ops, err := logic.AssembleString(programStr) - if err != nil { + ops, err1 := logic.AssembleString(programStr) + if err1 != nil { ops.ReportMultipleErrors(teal, os.Stderr) reportErrorf("Internal error, cannot assemble %v \n", programStr) } diff --git a/cmd/tealdbg/local.go b/cmd/tealdbg/local.go index 0f31d795a8..d0e50151c0 100644 --- a/cmd/tealdbg/local.go +++ b/cmd/tealdbg/local.go @@ -379,19 +379,19 @@ func (r *LocalRunner) Setup(dp *DebugParams) (err error) { r.runs[i].program = data if IsTextFile(data) { source := string(data) - ops, err := logic.AssembleString(source) + ops, err1 := logic.AssembleString(source) if ops.Version > r.proto.LogicSigVersion { return fmt.Errorf("program version (%d) is beyond the maximum supported protocol version (%d)", ops.Version, r.proto.LogicSigVersion) } - if err != nil { + if err1 != nil { errorLines := "" for _, lineError := range ops.Errors { errorLines = fmt.Sprintf("%s\n%s", errorLines, lineError.Error()) } if errorLines != "" { - return fmt.Errorf("%w:%s", err, errorLines) + return fmt.Errorf("%w:%s", err1, errorLines) } - return err + return err1 } r.runs[i].program = ops.Program if !dp.DisableSourceMap { diff --git a/cmd/tealdbg/server.go b/cmd/tealdbg/server.go index 5bce050a03..7eb90eec3c 100644 --- a/cmd/tealdbg/server.go +++ b/cmd/tealdbg/server.go @@ -156,9 +156,9 @@ func (ds *DebugServer) startDebug() (err error) { } go func() { - err := ds.server.ListenAndServe() - if err != nil && err != http.ErrServerClosed { - log.Panicf("failed to listen: %v", err) + err1 := ds.server.ListenAndServe() + if err1 != nil && err1 != http.ErrServerClosed { + log.Panicf("failed to listen: %v", err1) } }() defer ds.server.Shutdown(context.Background()) diff --git a/daemon/algod/api/server/v2/handlers.go b/daemon/algod/api/server/v2/handlers.go index b6d702d008..06b1301f91 100644 --- a/daemon/algod/api/server/v2/handlers.go +++ b/daemon/algod/api/server/v2/handlers.go @@ -470,9 +470,9 @@ func (v2 *Handlers) AccountInformation(ctx echo.Context, address string, params // check against configured total limit on assets/apps if handle == protocol.CodecHandle { - data, err := encode(handle, record) - if err != nil { - return internalError(ctx, err, errFailedToEncodeResponse, v2.Log) + data, err1 := encode(handle, record) + if err1 != nil { + return internalError(ctx, err1, errFailedToEncodeResponse, v2.Log) } return ctx.Blob(http.StatusOK, contentType, data) } @@ -1553,8 +1553,8 @@ func (v2 *Handlers) PendingTransactionInformation(ctx echo.Context, txid string, // We didn't find it, return a failure if !ok { - err := errors.New(errTransactionNotFound) - return notFound(ctx, err, err.Error(), v2.Log) + err1 := errors.New(errTransactionNotFound) + return notFound(ctx, err1, err1.Error(), v2.Log) } // Encoding wasn't working well without embedding "real" objects. @@ -1607,9 +1607,9 @@ func (v2 *Handlers) getPendingTransactions(ctx echo.Context, max *uint64, format var addrPtr *basics.Address if addrFilter != nil { - addr, err := basics.UnmarshalChecksumAddress(*addrFilter) - if err != nil { - return badRequest(ctx, err, errFailedToParseAddress, v2.Log) + addr, err1 := basics.UnmarshalChecksumAddress(*addrFilter) + if err1 != nil { + return badRequest(ctx, err1, errFailedToParseAddress, v2.Log) } addrPtr = &addr } diff --git a/daemon/algod/server.go b/daemon/algod/server.go index 8a8bbde437..9b4ef58b11 100644 --- a/daemon/algod/server.go +++ b/daemon/algod/server.go @@ -294,7 +294,7 @@ func makeListener(addr string) (net.Listener, error) { preferredAddr := strings.Replace(addr, ":0", ":8080", -1) listener, err = net.Listen("tcp", preferredAddr) if err == nil { - return listener, err + return listener, nil } } // err was not nil or :0 was not provided, fall back to originally passed addr @@ -339,9 +339,9 @@ func (s *Server) Start() { } if cfg.EnableMetricReporting { - if err := s.metricCollector.Start(context.Background()); err != nil { + if err1 := s.metricCollector.Start(context.Background()); err1 != nil { // log this error - s.log.Infof("Unable to start metric collection service : %v", err) + s.log.Infof("Unable to start metric collection service : %v", err1) } s.metricServiceStarted = true } diff --git a/daemon/kmd/config/config.go b/daemon/kmd/config/config.go index 235935950a..95bce23129 100644 --- a/daemon/kmd/config/config.go +++ b/daemon/kmd/config/config.go @@ -116,7 +116,7 @@ func LoadKMDConfig(dataDir string) (cfg KMDConfig, err error) { // SaveObjectToFile may return an unhandled error because // there is nothing to do if an error occurs codecs.SaveObjectToFile(exampleFilename, cfg, true) - return cfg, nil + return cfg, nil //nolint:nilerr // intentional } // Fill in the non-default values err = json.Unmarshal(dat, &cfg) diff --git a/daemon/kmd/server/server.go b/daemon/kmd/server/server.go index ec5e695b5b..b94530eaf9 100644 --- a/daemon/kmd/server/server.go +++ b/daemon/kmd/server/server.go @@ -223,9 +223,9 @@ func (ws *WalletServer) start(kill chan os.Signal) (died chan error, sock string ws.mux.Unlock() // Shut down the server - err := srv.Shutdown(context.Background()) - if err != nil { - ws.Log.Warnf("non-nil error stopping kmd wallet HTTP server: %s", err) + err1 := srv.Shutdown(context.Background()) + if err1 != nil { + ws.Log.Warnf("non-nil error stopping kmd wallet HTTP server: %s", err1) } }() diff --git a/daemon/kmd/wallet/driver/ledger.go b/daemon/kmd/wallet/driver/ledger.go index 754b7bdd9b..8bca370920 100644 --- a/daemon/kmd/wallet/driver/ledger.go +++ b/daemon/kmd/wallet/driver/ledger.go @@ -136,9 +136,9 @@ func (lwd *LedgerWalletDriver) scanWalletsLocked() error { continue } - dev, err := info.Open() - if err != nil { - lwd.log.Warnf("enumerated but failed to open ledger %s %x: %v", info.Path, info.ProductID, err) + dev, err1 := info.Open() + if err1 != nil { + lwd.log.Warnf("enumerated but failed to open ledger %s %x: %v", info.Path, info.ProductID, err1) continue } diff --git a/data/account/account.go b/data/account/account.go index d5840e041d..03ac4471fb 100644 --- a/data/account/account.go +++ b/data/account/account.go @@ -57,19 +57,19 @@ func ImportRoot(store db.Accessor, seed [32]byte) (acc Root, err error) { raw := protocol.Encode(s) err = store.Atomic(func(ctx context.Context, tx *sql.Tx) error { - err := rootInstallDatabase(tx) - if err != nil { - return fmt.Errorf("ImportRoot: failed to install database: %v", err) + err1 := rootInstallDatabase(tx) + if err1 != nil { + return fmt.Errorf("ImportRoot: failed to install database: %v", err1) } - stmt, err := tx.Prepare("insert into RootAccount values (?)") - if err != nil { - return fmt.Errorf("ImportRoot: failed to prepare statement: %v", err) + stmt, err1 := tx.Prepare("insert into RootAccount values (?)") + if err1 != nil { + return fmt.Errorf("ImportRoot: failed to prepare statement: %v", err1) } - _, err = stmt.Exec(raw) - if err != nil { - return fmt.Errorf("ImportRoot: failed to insert account: %v", err) + _, err1 = stmt.Exec(raw) + if err1 != nil { + return fmt.Errorf("ImportRoot: failed to insert account: %v", err1) } return nil @@ -91,18 +91,18 @@ func RestoreRoot(store db.Accessor) (acc Root, err error) { err = store.Atomic(func(ctx context.Context, tx *sql.Tx) error { var nrows int row := tx.QueryRow("select count(*) from RootAccount") - err := row.Scan(&nrows) - if err != nil { - return fmt.Errorf("RestoreRoot: could not query storage: %v", err) + err1 := row.Scan(&nrows) + if err1 != nil { + return fmt.Errorf("RestoreRoot: could not query storage: %v", err1) } if nrows != 1 { logging.Base().Infof("RestoreRoot: state not found (n = %v)", nrows) } row = tx.QueryRow("select data from RootAccount") - err = row.Scan(&raw) - if err != nil { - return fmt.Errorf("RestoreRoot: could not read account raw data: %v", err) + err1 = row.Scan(&raw) + if err1 != nil { + return fmt.Errorf("RestoreRoot: could not read account raw data: %v", err1) } return nil @@ -146,9 +146,9 @@ func RestoreParticipation(store db.Accessor) (acc PersistedParticipation, err er err = store.Atomic(func(ctx context.Context, tx *sql.Tx) error { var nrows int row := tx.QueryRow("select count(*) from ParticipationAccount") - err := row.Scan(&nrows) - if err != nil { - return fmt.Errorf("RestoreParticipation: could not query storage: %v", err) + err1 := row.Scan(&nrows) + if err1 != nil { + return fmt.Errorf("RestoreParticipation: could not query storage: %v", err1) } if nrows != 1 { logging.Base().Infof("RestoreParticipation: state not found (n = %v)", nrows) @@ -156,9 +156,9 @@ func RestoreParticipation(store db.Accessor) (acc PersistedParticipation, err er row = tx.QueryRow("select parent, vrf, voting, firstValid, lastValid, keyDilution, stateProof from ParticipationAccount") - err = row.Scan(&rawParent, &rawVRF, &rawVoting, &acc.FirstValid, &acc.LastValid, &acc.KeyDilution, &rawStateProof) - if err != nil { - return fmt.Errorf("RestoreParticipation: could not read account raw data: %v", err) + err1 = row.Scan(&rawParent, &rawVRF, &rawVoting, &acc.FirstValid, &acc.LastValid, &acc.KeyDilution, &rawStateProof) + if err1 != nil { + return fmt.Errorf("RestoreParticipation: could not read account raw data: %v", err1) } copy(acc.Parent[:32], rawParent) diff --git a/data/transactions/verify/txn.go b/data/transactions/verify/txn.go index 089875cc60..ec4c112810 100644 --- a/data/transactions/verify/txn.go +++ b/data/transactions/verify/txn.go @@ -489,7 +489,7 @@ func PaysetGroups(ctx context.Context, payset [][]transactions.SignedTxn, blkHea return tasksCtx.Err() case worksets <- struct{}{}: if len(nextWorkset) > 0 { - err := verificationPool.EnqueueBacklog(ctx, func(arg interface{}) interface{} { + err1 := verificationPool.EnqueueBacklog(ctx, func(arg interface{}) interface{} { var grpErr error // check if we've canceled the request while this was in the queue. if tasksCtx.Err() != nil { @@ -514,8 +514,8 @@ func PaysetGroups(ctx context.Context, payset [][]transactions.SignedTxn, blkHea cache.AddPayset(txnGroups, groupCtxs) return nil }, nextWorkset, worksDoneCh) - if err != nil { - return err + if err1 != nil { + return err1 } processing++ nextWorkset = nil diff --git a/gen/generate.go b/gen/generate.go index 5e063da89f..0352d8e2c2 100644 --- a/gen/generate.go +++ b/gen/generate.go @@ -193,7 +193,7 @@ func generateGenesisFiles(protoVersion protocol.ConsensusVersion, protoParams co var writeMu deadlock.Mutex createWallet := func() { - var err error + var err1 error defer creatingWalletsWaitGroup.Done() for { var wallet genesisAllocation @@ -230,15 +230,15 @@ func generateGenesisFiles(protoVersion protocol.ConsensusVersion, protoParams co if rootkeyErr != nil { os.Remove(wfilename) - rootDB, err = db.MakeErasableAccessor(wfilename) - if err != nil { - err = fmt.Errorf("couldn't open root DB accessor %s: %v", wfilename, err) + rootDB, err1 = db.MakeErasableAccessor(wfilename) + if err1 != nil { + err1 = fmt.Errorf("couldn't open root DB accessor %s: %v", wfilename, err1) } else { - root, err = account.GenerateRoot(rootDB) + root, err1 = account.GenerateRoot(rootDB) } - if err != nil { + if err1 != nil { os.Remove(wfilename) - errorsChannel <- err + errorsChannel <- err1 return } if verbose { @@ -250,22 +250,22 @@ func generateGenesisFiles(protoVersion protocol.ConsensusVersion, protoParams co if partkeyErr != nil && wallet.Online == basics.Online { os.Remove(pfilename) - partDB, err = db.MakeErasableAccessor(pfilename) - if err != nil { - err = fmt.Errorf("couldn't open participation DB accessor %s: %v", pfilename, err) + partDB, err1 = db.MakeErasableAccessor(pfilename) + if err1 != nil { + err1 = fmt.Errorf("couldn't open participation DB accessor %s: %v", pfilename, err1) os.Remove(pfilename) - errorsChannel <- err + errorsChannel <- err1 return } if verbose { verbosedOutput <- fmt.Sprintf("Generating %s's keys for a period of %d rounds", wallet.Name, basics.Round(lastWalletValid).SubSaturate(basics.Round(firstWalletValid))) } - part, err = account.FillDBWithParticipationKeys(partDB, root.Address(), basics.Round(firstWalletValid), basics.Round(lastWalletValid), partKeyDilution) - if err != nil { - err = fmt.Errorf("could not generate new participation file %s: %v", pfilename, err) + part, err1 = account.FillDBWithParticipationKeys(partDB, root.Address(), basics.Round(firstWalletValid), basics.Round(lastWalletValid), partKeyDilution) + if err1 != nil { + err1 = fmt.Errorf("could not generate new participation file %s: %v", pfilename, err1) os.Remove(pfilename) - errorsChannel <- err + errorsChannel <- err1 return } if verbose { @@ -328,8 +328,8 @@ func generateGenesisFiles(protoVersion protocol.ConsensusVersion, protoParams co // check to see if we had any errors. select { - case err := <-errorsChannel: - return err + case err1 := <-errorsChannel: + return err1 default: } @@ -414,7 +414,7 @@ func loadRootKey(filename string) (root account.Root, rootDB db.Accessor, err er root, err = account.RestoreRoot(rootDB) if err == nil { - return + return //nolint:nilerr // intentional } err = fmt.Errorf("could not restore existing root file %s: %v", filename, err) @@ -436,7 +436,7 @@ func loadPartKeys(filename string) (part account.PersistedParticipation, partDB part, err = account.RestoreParticipation(partDB) if err == nil { - return + return //nolint:nilerr // intentional } // Don't override 'unsupported schema' error diff --git a/ledger/catchupaccessor.go b/ledger/catchupaccessor.go index dd64e46d1e..0a51f1a1dd 100644 --- a/ledger/catchupaccessor.go +++ b/ledger/catchupaccessor.go @@ -978,8 +978,8 @@ func (c *catchpointCatchupAccessorImpl) BuildMerkleTrie(ctx context.Context, pro wg.Wait() select { - case err := <-errChan: - return err + case err1 := <-errChan: + return err1 default: } diff --git a/ledger/eval/appcow.go b/ledger/eval/appcow.go index 83aa739629..83603acb22 100644 --- a/ledger/eval/appcow.go +++ b/ledger/eval/appcow.go @@ -415,7 +415,7 @@ func (cb *roundCowState) delKey(addr basics.Address, aidx basics.AppIndex, globa // Write the value delta associated with deleting this key lsd, err := cb.ensureStorageDelta(addr, aidx, global, remainAllocAction, accountIdx) if err != nil { - return nil + return err } vdelta, ok := lsd.kvCow[key] diff --git a/libgoal/libgoal.go b/libgoal/libgoal.go index bb167d999f..0fa15e9b3c 100644 --- a/libgoal/libgoal.go +++ b/libgoal/libgoal.go @@ -227,7 +227,7 @@ func getDataDir(dataDir string) (string, error) { func getNodeController(binDir, dataDir string) (nc nodecontrol.NodeController, err error) { dataDir, err = getDataDir(dataDir) if err != nil { - return nodecontrol.NodeController{}, nil + return nodecontrol.NodeController{}, err } return nodecontrol.MakeNodeController(binDir, dataDir), nil diff --git a/logging/cyclicWriter.go b/logging/cyclicWriter.go index e860ffc9e3..978052d105 100644 --- a/logging/cyclicWriter.go +++ b/logging/cyclicWriter.go @@ -143,23 +143,23 @@ func (cyclic *CyclicFileWriter) Write(p []byte) (n int, err error) { now := time.Now() // we don't have enough space to write the entry, so archive data cyclic.writer.Close() - var err error + globPath := cyclic.getArchiveGlob() - oldarchives, err := filepath.Glob(globPath) - if err != nil && !os.IsNotExist(err) { - fmt.Fprintf(os.Stderr, "%s: glob err: %s\n", globPath, err) + oldarchives, err1 := filepath.Glob(globPath) + if err1 != nil && !os.IsNotExist(err1) { + fmt.Fprintf(os.Stderr, "%s: glob err: %s\n", globPath, err1) } else if cyclic.maxLogAge != 0 { tooOld := now.Add(-cyclic.maxLogAge) for _, path := range oldarchives { - finfo, err := os.Stat(path) - if err != nil { - fmt.Fprintf(os.Stderr, "%s: stat: %s\n", path, err) + finfo, err2 := os.Stat(path) + if err2 != nil { + fmt.Fprintf(os.Stderr, "%s: stat: %s\n", path, err2) continue } if finfo.ModTime().Before(tooOld) { - err = os.Remove(path) - if err != nil { - fmt.Fprintf(os.Stderr, "%s: rm: %s\n", path, err) + err2 = os.Remove(path) + if err2 != nil { + fmt.Fprintf(os.Stderr, "%s: rm: %s\n", path, err2) } } } @@ -174,30 +174,30 @@ func (cyclic *CyclicFileWriter) Write(p []byte) (n int, err error) { shouldBz2 = true archivePath = archivePath[:len(archivePath)-4] } - if err = util.MoveFile(cyclic.liveLog, archivePath); err != nil { - panic(fmt.Sprintf("CyclicFileWriter: cannot archive full log %v", err)) + if err1 = util.MoveFile(cyclic.liveLog, archivePath); err1 != nil { + panic(fmt.Sprintf("CyclicFileWriter: cannot archive full log %v", err1)) } if shouldGz { cmd := exec.Command("gzip", archivePath) - err = cmd.Start() - if err != nil { - fmt.Fprintf(os.Stderr, "%s: could not gzip: %s", archivePath, err) + err1 = cmd.Start() + if err1 != nil { + fmt.Fprintf(os.Stderr, "%s: could not gzip: %s", archivePath, err1) } else { go procWait(cmd, archivePath) } } else if shouldBz2 { cmd := exec.Command("bzip2", archivePath) - err = cmd.Start() - if err != nil { - fmt.Fprintf(os.Stderr, "%s: could not bzip2: %s", archivePath, err) + err1 = cmd.Start() + if err1 != nil { + fmt.Fprintf(os.Stderr, "%s: could not bzip2: %s", archivePath, err1) } else { go procWait(cmd, archivePath) } } cyclic.logStart = now - cyclic.writer, err = os.OpenFile(cyclic.liveLog, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0666) - if err != nil { - panic(fmt.Sprintf("CyclicFileWriter: cannot open log file %v", err)) + cyclic.writer, err1 = os.OpenFile(cyclic.liveLog, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0666) + if err1 != nil { + panic(fmt.Sprintf("CyclicFileWriter: cannot open log file %v", err1)) } cyclic.nextWrite = 0 } diff --git a/logging/telemetry.go b/logging/telemetry.go index fa4af559ba..a60dc843c9 100644 --- a/logging/telemetry.go +++ b/logging/telemetry.go @@ -198,7 +198,7 @@ func EnsureTelemetryConfigCreated(dataDir *string, genesisID string) (TelemetryC */ // If the directory exists... - if _, err := os.Stat(*dataDir); err == nil { + if _, err1 := os.Stat(*dataDir); err1 == nil { // Remember, if we had a data directory supplied we want to save the config there configPath = filepath.Join(*dataDir, TelemetryConfigFilename) diff --git a/netdeploy/network.go b/netdeploy/network.go index ec93b3800e..b49c9a2797 100644 --- a/netdeploy/network.go +++ b/netdeploy/network.go @@ -325,14 +325,14 @@ func (n Network) Start(binDir string, redirectOutput bool) error { PeerAddress: relayAddress, // on the first iteration it would be empty, which is ok. subsequent iterations would link all the relays. } - _, err := nc.StartAlgod(args) - if err != nil { - return err + _, err1 := nc.StartAlgod(args) + if err1 != nil { + return err1 } - relayAddress, err = n.getRelayAddress(nc) - if err != nil { - return err + relayAddress, err1 = n.getRelayAddress(nc) + if err1 != nil { + return err1 } relayNameToAddress[relayDir] = relayAddress } @@ -342,19 +342,18 @@ func (n Network) Start(binDir string, redirectOutput bool) error { } // retry fetching the relay address -func (n Network) getRelayAddress(nc nodecontrol.NodeController) (relayAddress string, err error) { +func (n Network) getRelayAddress(nc nodecontrol.NodeController) (string, error) { for i := 1; ; i++ { - relayAddress, err = nc.GetListeningAddress() + relayAddress, err := nc.GetListeningAddress() if err == nil { - return + return relayAddress, nil } if i <= maxGetRelayAddressRetry { time.Sleep(100 * time.Millisecond) } else { - break + return "", err } } - return } // GetPeerAddresses returns an array of Relay addresses, if any; to be used to start nodes diff --git a/netdeploy/remote/deployedNetwork.go b/netdeploy/remote/deployedNetwork.go index a02f396d6d..9ba0e1a02f 100644 --- a/netdeploy/remote/deployedNetwork.go +++ b/netdeploy/remote/deployedNetwork.go @@ -567,9 +567,9 @@ func createBlock(src basics.Address, prev bookkeeping.Block, roundTxnCnt uint64, } for _, stxn := range stxns { - txib, err := block.EncodeSignedTxn(stxn, transactions.ApplyData{}) - if err != nil { - return bookkeeping.Block{}, err + txib, err1 := block.EncodeSignedTxn(stxn, transactions.ApplyData{}) + if err1 != nil { + return bookkeeping.Block{}, err1 } txibs = append(txibs, txib) } diff --git a/nodecontrol/NodeController.go b/nodecontrol/NodeController.go index 504e1714b6..30179a3d39 100644 --- a/nodecontrol/NodeController.go +++ b/nodecontrol/NodeController.go @@ -126,7 +126,7 @@ func killPID(pid int) (killed bool, err error) { // Send null signal - if process still exists, it'll return nil // So when we get an error, assume it's gone. if err = process.Signal(syscall.Signal(0)); err != nil { - return false, nil + return false, nil //nolint:nilerr // intentional } select { case <-waitLong: diff --git a/rpcs/ledgerService.go b/rpcs/ledgerService.go index a51a9fcc3d..60459d9f98 100644 --- a/rpcs/ledgerService.go +++ b/rpcs/ledgerService.go @@ -225,9 +225,9 @@ func (ls *LedgerService) ServeHTTP(response http.ResponseWriter, request *http.R requestedCompressedResponse := strings.Contains(request.Header.Get("Accept-Encoding"), "gzip") if requestedCompressedResponse { response.Header().Set("Content-Encoding", "gzip") - written, err := io.Copy(response, cs) - if err != nil { - logging.Base().Infof("LedgerService.ServeHTTP : unable to write compressed catchpoint file for round %d, written bytes %d : %v", round, written, err) + written, err1 := io.Copy(response, cs) + if err1 != nil { + logging.Base().Infof("LedgerService.ServeHTTP : unable to write compressed catchpoint file for round %d, written bytes %d : %v", round, written, err1) } elapsed := time.Since(start) logging.Base().Infof("LedgerService.ServeHTTP: served catchpoint round %d in %d sec", round, int(elapsed.Seconds())) diff --git a/test/commandandcontrol/cc_client/main.go b/test/commandandcontrol/cc_client/main.go index 7e3e30d5ee..731d51458d 100644 --- a/test/commandandcontrol/cc_client/main.go +++ b/test/commandandcontrol/cc_client/main.go @@ -78,9 +78,9 @@ func main() { } defer func() { log.Infof("closing service connection: %s", serverWs.RemoteAddr()) - err := serverWs.Close() - if err != nil { - log.Fatalf("error closing service websocket %v", err) + err1 := serverWs.Close() + if err1 != nil { + log.Fatalf("error closing service websocket %v", err1) } }() serverWs.Unsafe = true diff --git a/test/framework/fixtures/goalFixture.go b/test/framework/fixtures/goalFixture.go index 9c217e3e35..5c5c3fa6ce 100644 --- a/test/framework/fixtures/goalFixture.go +++ b/test/framework/fixtures/goalFixture.go @@ -82,7 +82,7 @@ func (f *GoalFixture) executeCommand(args ...string) (retStdout string, retStder // combine the error and the output so that we could return it as a single error object. func combineExecuteError(retStdout string, retStderr string, err error) error { if err == nil { - return err + return nil } return fmt.Errorf("%v\nStdout:\n%s\nStderr:\n%s", err, retStdout, retStderr) } diff --git a/test/framework/fixtures/libgoalFixture.go b/test/framework/fixtures/libgoalFixture.go index 9af69b3c8a..70be6e5186 100644 --- a/test/framework/fixtures/libgoalFixture.go +++ b/test/framework/fixtures/libgoalFixture.go @@ -207,18 +207,18 @@ func (f *LibGoalFixture) importRootKeys(lg *libgoal.Client, dataDir string) { } // Fetch an account.Root from the database - root, err := account.RestoreRoot(handle) - if err != nil { + root, err1 := account.RestoreRoot(handle) + if err1 != nil { // Couldn't read it, skip it continue } secretKey := root.Secrets().SK - wh, err := lg.GetUnencryptedWalletHandle() - f.failOnError(err, "couldn't get default wallet handle: %v") - _, err = lg.ImportKey(wh, secretKey[:]) - if err != nil && !strings.Contains(err.Error(), "key already exists") { - f.failOnError(err, "couldn't import secret: %v") + wh, err1 := lg.GetUnencryptedWalletHandle() + f.failOnError(err1, "couldn't get default wallet handle: %v") + _, err1 = lg.ImportKey(wh, secretKey[:]) + if err1 != nil && !strings.Contains(err1.Error(), "key already exists") { + f.failOnError(err1, "couldn't import secret: %v") } accountsWithRootKeys[root.Address().String()] = true handle.Close() diff --git a/test/netperf-go/puppeteer/puppeteer.go b/test/netperf-go/puppeteer/puppeteer.go index a2ebbd812c..a2a6b385c4 100644 --- a/test/netperf-go/puppeteer/puppeteer.go +++ b/test/netperf-go/puppeteer/puppeteer.go @@ -201,9 +201,9 @@ func (p *puppet) exec(wg *sync.WaitGroup, errs chan error) { fmt.Printf("%s: Disabled step '%s' skipped.\n", p.recipeName, recipeStep.StepName) continue } - err := p.runStep(recipeStep, time.Hour) - if err != nil { - errs <- fmt.Errorf("Failed running recipe step '%s' : %v", recipeStep.StepName, err) + err1 := p.runStep(recipeStep, time.Hour) + if err1 != nil { + errs <- fmt.Errorf("Failed running recipe step '%s' : %v", recipeStep.StepName, err1) return } } @@ -218,9 +218,9 @@ func (p *puppet) exec(wg *sync.WaitGroup, errs chan error) { fmt.Printf("%s: Disabled step '%s' skipped.\n", p.recipeName, recipeStep.StepName) continue } - err := p.runStep(recipeStep, time.Hour) - if err != nil { - errs <- fmt.Errorf("Failed running teardown step '%s' : %v", recipeStep.StepName, err) + err1 := p.runStep(recipeStep, time.Hour) + if err1 != nil { + errs <- fmt.Errorf("Failed running teardown step '%s' : %v", recipeStep.StepName, err1) return } } @@ -440,8 +440,8 @@ func (p *puppet) collectMetrics() { } else { metricFetcher := makePromMetricFetcher(string(hostNameBytes)) var err error - if results, err := metricFetcher.getMetric(metric.Query); err == nil { - if result, err := metricFetcher.getSingleValue(results); err == nil { + if results, err1 := metricFetcher.getMetric(metric.Query); err1 == nil { + if result, err1 := metricFetcher.getSingleValue(results); err1 == nil { p.metrics[metric.Name] = result } } diff --git a/util/io.go b/util/io.go index f01b58be31..1244498267 100644 --- a/util/io.go +++ b/util/io.go @@ -190,8 +190,8 @@ func CopyFolder(source, dest string) error { } func copyFolder(source string, dest string, info os.FileInfo, includeFilter IncludeFilter) (err error) { - if err := os.MkdirAll(dest, info.Mode()); err != nil { - return fmt.Errorf("error creating destination folder: %v", err) + if err1 := os.MkdirAll(dest, info.Mode()); err1 != nil { + return fmt.Errorf("error creating destination folder: %v", err1) } contents, err := os.ReadDir(source) diff --git a/util/tar/tar.go b/util/tar/tar.go index e97c03b793..012ead433f 100644 --- a/util/tar/tar.go +++ b/util/tar/tar.go @@ -72,8 +72,8 @@ func Compress(src string, writers ...io.Writer) error { header.Name = strings.TrimPrefix(strings.Replace(file, src, "", -1), string(filepath.Separator)) // write the header - if err := tw.WriteHeader(header); err != nil { - return err + if err1 := tw.WriteHeader(header); err1 != nil { + return err1 } // return on non-regular files (thanks to [kumo](https://medium.com/@komuw/just-like-you-did-fbdd7df829d3) for this suggested update)