From 0d7b33d9bd7d8ec550d61cba8d21a35cb3236103 Mon Sep 17 00:00:00 2001 From: jholdstock Date: Wed, 16 Oct 2024 09:06:46 +0100 Subject: [PATCH] multi: Use go 1.22 language features. --- cmd/v3tool/main.go | 2 +- database/votechange_test.go | 4 ++-- internal/vspd/config.go | 4 ++-- internal/webapi/middleware.go | 2 +- rpc/dcrwallet.go | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/v3tool/main.go b/cmd/v3tool/main.go index 2537db6..2038e6c 100644 --- a/cmd/v3tool/main.go +++ b/cmd/v3tool/main.go @@ -107,7 +107,7 @@ func run() int { log.Infof(" %s", tkt) } - for i := 0; i < len(tickets.Hashes); i++ { + for i := range len(tickets.Hashes) { // Stop if shutdown requested. if ctx.Err() != nil { return 0 diff --git a/database/votechange_test.go b/database/votechange_test.go index f63611c..c9bddaf 100644 --- a/database/votechange_test.go +++ b/database/votechange_test.go @@ -1,4 +1,4 @@ -// Copyright (c) 2020 The Decred developers +// Copyright (c) 2020-2024 The Decred developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. @@ -39,7 +39,7 @@ func testVoteChangeRecords(t *testing.T) { } // Insert some more records, giving us one greater than the limit. - for i := 0; i < maxVoteChangeRecords; i++ { + for range maxVoteChangeRecords { err = db.SaveVoteChange(hash, record) if err != nil { t.Fatalf("error storing vote change record in database: %v", err) diff --git a/internal/vspd/config.go b/internal/vspd/config.go index 8dc65e6..13b2640 100644 --- a/internal/vspd/config.go +++ b/internal/vspd/config.go @@ -379,7 +379,7 @@ func LoadConfig() (*Config, error) { // Load dcrwallet RPC certificate(s). walletCerts := make([][]byte, numCert) - for i := 0; i < numCert; i++ { + for i := range numCert { certs[i] = cleanAndExpandPath(certs[i]) walletCerts[i], err = os.ReadFile(certs[i]) if err != nil { @@ -394,7 +394,7 @@ func LoadConfig() (*Config, error) { } // Add default port for the active network if there is no port specified. - for i := 0; i < numHost; i++ { + for i := range numHost { walletHosts[i] = normalizeAddress(walletHosts[i], cfg.network.WalletRPCServerPort) } diff --git a/internal/webapi/middleware.go b/internal/webapi/middleware.go index 3d61d5c..42ad962 100644 --- a/internal/webapi/middleware.go +++ b/internal/webapi/middleware.go @@ -290,7 +290,7 @@ func (w *WebAPI) broadcastTicket(c *gin.Context) { txBroadcast := func() bool { // Wait for 1 second and try again, max 7 attempts. - for i := 0; i < 7; i++ { + for range 7 { time.Sleep(1 * time.Second) err := dcrdClient.SendRawTransaction(request.ParentHex) if err == nil { diff --git a/rpc/dcrwallet.go b/rpc/dcrwallet.go index 728f59b..45730e1 100644 --- a/rpc/dcrwallet.go +++ b/rpc/dcrwallet.go @@ -34,7 +34,7 @@ type WalletConnect struct { func SetupWallet(user, pass, addrs []string, cert [][]byte, params *chaincfg.Params, log slog.Logger) WalletConnect { clients := make([]*client, len(addrs)) - for i := 0; i < len(addrs); i++ { + for i := range len(addrs) { clients[i] = setup(user[i], pass[i], addrs[i], cert[i], log) }