From 33aeffdf9e943c71c1f431e0abab09a9f89100f2 Mon Sep 17 00:00:00 2001 From: David Hill Date: Thu, 17 Feb 2022 15:40:46 -0500 Subject: [PATCH] build: update golangci-lint to v1.44.1 --- .github/workflows/go.yml | 2 +- addrmgr/addrmanager_test.go | 2 +- blockchain/common_test.go | 2 +- blockchain/internal/spendpruner/pruner_test.go | 2 +- internal/mempool/mempool_test.go | 4 ++-- internal/rpcserver/rpcserver.go | 2 +- internal/rpcserver/rpcserverhandlers_test.go | 2 +- internal/rpcserver/treasury_test.go | 4 ++-- rpctest/rpc_harness.go | 2 +- upnp.go | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index b8e22626fe..67cf78a807 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -15,7 +15,7 @@ jobs: - name: Check out source uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f #v2.3.4 - name: Install Linters - run: "curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.42.0" + run: "curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.44.1" - name: Build run: go build ./... - name: Test diff --git a/addrmgr/addrmanager_test.go b/addrmgr/addrmanager_test.go index 5f01929f65..f1e7704f65 100644 --- a/addrmgr/addrmanager_test.go +++ b/addrmgr/addrmanager_test.go @@ -80,7 +80,7 @@ func TestStartStop(t *testing.T) { wantNetAddrKey := net.JoinHostPort(someIP, "8333") gotNetAddrKey := knownAddress.na.Key() if gotNetAddrKey != wantNetAddrKey { - t.Fatal("address manager does not contain expected address - "+ + t.Fatalf("address manager does not contain expected address - "+ "got %v, want %v", gotNetAddrKey, wantNetAddrKey) } diff --git a/blockchain/common_test.go b/blockchain/common_test.go index 54343de2d9..3c0aea0ac8 100644 --- a/blockchain/common_test.go +++ b/blockchain/common_test.go @@ -364,7 +364,7 @@ func newFakeCreateTSpend(privKey []byte, payouts []dcrutil.Amount, fee dcrutil.A } script := make([]byte, len(p2shOpTrueScript)+1) script[0] = txscript.OP_TGEN - copy(script[1:], p2shOpTrueScript[:]) + copy(script[1:], p2shOpTrueScript) msgTx.AddTxOut(wire.NewTxOut(int64(amount), script)) } diff --git a/blockchain/internal/spendpruner/pruner_test.go b/blockchain/internal/spendpruner/pruner_test.go index 8f7cac7c8e..6458bfa695 100644 --- a/blockchain/internal/spendpruner/pruner_test.go +++ b/blockchain/internal/spendpruner/pruner_test.go @@ -306,7 +306,7 @@ func TestSpendPruner(t *testing.T) { hashB := &chainhash.Hash{'b'} err = pruner.addSpendConsumerDeps(hashB) if err != nil { - t.Fatal("unexpected error adding consumer dependencies "+ + t.Fatalf("unexpected error adding consumer dependencies "+ "for hashB: %v", err) } diff --git a/internal/mempool/mempool_test.go b/internal/mempool/mempool_test.go index 8b1019175f..af2bf94230 100644 --- a/internal/mempool/mempool_test.go +++ b/internal/mempool/mempool_test.go @@ -1248,7 +1248,7 @@ func TestOrphanReject(t *testing.T) { // Ensure no transactions were reported as accepted. if len(acceptedTxns) != 0 { - t.Fatal("ProcessTransaction: reported %d accepted "+ + t.Fatalf("ProcessTransaction: reported %d accepted "+ "transactions from failed orphan attempt", len(acceptedTxns)) } @@ -2358,7 +2358,7 @@ func createTSpend(t *testing.T, expiry uint32, tspendAmount, tspendFee int64, pi } script := make([]byte, len(p2shOpTrueScript)+1) script[0] = txscript.OP_TGEN - copy(script[1:], p2shOpTrueScript[:]) + copy(script[1:], p2shOpTrueScript) msgTx.AddTxOut(wire.NewTxOut(tspendAmount, script)) msgTx.AddTxIn(&wire.TxIn{ diff --git a/internal/rpcserver/rpcserver.go b/internal/rpcserver/rpcserver.go index c56b972b5c..b9e4d263f6 100644 --- a/internal/rpcserver/rpcserver.go +++ b/internal/rpcserver/rpcserver.go @@ -5591,7 +5591,7 @@ func handleVerifyMessage(_ context.Context, s *Server, cmd interface{}) (interfa // handleVersion implements the version command. func handleVersion(_ context.Context, s *Server, cmd interface{}) (interface{}, error) { - runtimeVer := strings.Replace(runtime.Version(), ".", "-", -1) + runtimeVer := strings.ReplaceAll(runtime.Version(), ".", "-") buildMeta := version.NormalizeString(runtimeVer) build := version.NormalizeString(version.BuildMetadata) if build != "" { diff --git a/internal/rpcserver/rpcserverhandlers_test.go b/internal/rpcserver/rpcserverhandlers_test.go index 9ddbc7dbf9..11a6c840b5 100644 --- a/internal/rpcserver/rpcserverhandlers_test.go +++ b/internal/rpcserver/rpcserverhandlers_test.go @@ -8542,7 +8542,7 @@ func TestHandleGetRawTransaction(t *testing.T) { func TestHandleVersion(t *testing.T) { t.Parallel() - runtimeVer := strings.Replace(runtime.Version(), ".", "-", -1) + runtimeVer := strings.ReplaceAll(runtime.Version(), ".", "-") version.BuildMetadata = "foo" version.PreRelease = "pre" buildMeta := version.NormalizeString(fmt.Sprintf("%s.%s", diff --git a/internal/rpcserver/treasury_test.go b/internal/rpcserver/treasury_test.go index ed6d829b8d..15fd6db174 100644 --- a/internal/rpcserver/treasury_test.go +++ b/internal/rpcserver/treasury_test.go @@ -627,7 +627,7 @@ func TestTreasury(t *testing.T) { t.Fatal(err) } assertTBaseAmount(t, hn.Node, tbaseSubsidy) - nbVotes = nbVotes + int64(4) + nbVotes += int64(4) assertTSpendVoteCount(t, hn.Node, tspendNo, false, 0, nbVotes) assertTSpendVoteCount(t, hn.Node, tspendLarge, false, nbVotes, 0) @@ -639,7 +639,7 @@ func TestTreasury(t *testing.T) { if _, err := vw.GenerateBlocks(timeoutCtx(t, time.Minute), 1); err != nil { t.Fatal(err) } - nbVotes = nbVotes + int64(3) + nbVotes += int64(3) assertTBaseAmount(t, hn.Node, tbaseSubsidy) assertTSpendVoteCount(t, hn.Node, tspendNo, false, 0, nbVotes) assertTSpendVoteCount(t, hn.Node, tspendLarge, false, nbVotes, 0) diff --git a/rpctest/rpc_harness.go b/rpctest/rpc_harness.go index 835fdbef8e..944ca816a9 100644 --- a/rpctest/rpc_harness.go +++ b/rpctest/rpc_harness.go @@ -173,7 +173,7 @@ func New(t *testing.T, activeNet *chaincfg.Params, handlers *rpcclient.Notificat } // Uncomment and change to enable additional dcrd debug/trace output. - //config.debugLevel = "TXMP=trace,TRSY=trace,RPCS=trace,PEER=trace" + // config.debugLevel = "TXMP=trace,TRSY=trace,RPCS=trace,PEER=trace" // Generate p2p+rpc listening addresses. config.listen, config.rpcListen = generateListeningAddresses() diff --git a/upnp.go b/upnp.go index 8f634d7e54..b68796781b 100644 --- a/upnp.go +++ b/upnp.go @@ -289,7 +289,7 @@ func soapRequest(url, function, message string) (replyXML []byte, err error) { "\r\n" + "" + message + "" - req, err := http.NewRequest("POST", url, strings.NewReader(fullMessage)) + req, err := http.NewRequest(http.MethodPost, url, strings.NewReader(fullMessage)) if err != nil { return nil, err }