Merge pull request lightningnetwork#6731 from guggero/linter-upgrade

tools: upgrade linter version to v1.46.2

Author: guggero

.golangci.yml

@@ -108,6 +108,7 @@ linters:
   - contextcheck
   - errname
   - exhaustivestruct
+  - exhaustruct
   - goerr113
   - gomnd
   - ifshort

contractcourt/nursery_store.go

@@ -531,7 +531,7 @@ func (ns *NurseryStore) GraduateKinder(height uint32, kid *kidOutput) error {
 // FetchClass returns a list of the kindergarten and crib outputs whose timeouts
 // are expiring
 func (ns *NurseryStore) FetchClass(
-	height uint32) ([]kidOutput, []babyOutput, error) { // nolint:golint
+	height uint32) ([]kidOutput, []babyOutput, error) { // nolint:revive
 
 	// Construct list of all crib and kindergarten outputs that need to be
 	// processed at the provided block height.
@@ -592,7 +592,7 @@ func (ns *NurseryStore) FetchClass(
 
 // FetchPreschools returns a list of all outputs currently stored in the
 // preschool bucket.
-func (ns *NurseryStore) FetchPreschools() ([]kidOutput, error) { // nolint:golint
+func (ns *NurseryStore) FetchPreschools() ([]kidOutput, error) { // nolint:revive
 	var kids []kidOutput
 	if err := kvdb.View(ns.db, func(tx kvdb.RTx) error {
 		// Retrieve the existing chain bucket for this nursery store.

docs/release-notes/release-notes-0.16.0.md

@@ -1,13 +1,24 @@
 # Release Notes
 
 ## Misc
-* Warning messages from peers are now recognized and [logged](https://github.com/lightningnetwork/lnd/pull/6546) by lnd.
+* Warning messages from peers are now recognized and
+  [logged](https://github.com/lightningnetwork/lnd/pull/6546) by lnd.
 
 * [Fixed error typo](https://github.com/lightningnetwork/lnd/pull/6659).
 
-* [The macaroon key store implementation was refactored to be more generally useable](https://github.com/lightningnetwork/lnd/pull/6509).
+* [The macaroon key store implementation was refactored to be more generally
+  usable](https://github.com/lightningnetwork/lnd/pull/6509).
+
+## Code Health
+
+### Tooling and documentation
+
+* [The `golangci-lint` tool was updated to
+  `v1.46.2`](https://github.com/lightningnetwork/lnd/pull/6731)
 
 # Contributors (Alphabetical Order)
+
 * Carla Kirk-Cohen
 * ErikEk
 * Olaoluwa Osuntokun
+* Oliver Gugger

lnrpc/marshall_utils.go

@@ -147,28 +147,27 @@ func MarshalUtxos(utxos []*lnwallet.Utxo, activeNetParams *chaincfg.Params) (
 
 // MarshallOutputType translates a txscript.ScriptClass into a
 // lnrpc.OutputScriptType.
-func MarshallOutputType(o txscript.ScriptClass) (ret OutputScriptType) {
+func MarshallOutputType(o txscript.ScriptClass) OutputScriptType {
 	// Translate txscript ScriptClass type to the proper gRPC proto
 	// output script type.
 	switch o {
-	case txscript.PubKeyHashTy:
-		ret = OutputScriptType_SCRIPT_TYPE_PUBKEY_HASH
 	case txscript.ScriptHashTy:
-		ret = OutputScriptType_SCRIPT_TYPE_SCRIPT_HASH
+		return OutputScriptType_SCRIPT_TYPE_SCRIPT_HASH
 	case txscript.WitnessV0PubKeyHashTy:
-		ret = OutputScriptType_SCRIPT_TYPE_WITNESS_V0_PUBKEY_HASH
+		return OutputScriptType_SCRIPT_TYPE_WITNESS_V0_PUBKEY_HASH
 	case txscript.WitnessV0ScriptHashTy:
-		ret = OutputScriptType_SCRIPT_TYPE_WITNESS_V0_SCRIPT_HASH
+		return OutputScriptType_SCRIPT_TYPE_WITNESS_V0_SCRIPT_HASH
 	case txscript.PubKeyTy:
-		ret = OutputScriptType_SCRIPT_TYPE_PUBKEY
+		return OutputScriptType_SCRIPT_TYPE_PUBKEY
 	case txscript.MultiSigTy:
-		ret = OutputScriptType_SCRIPT_TYPE_MULTISIG
+		return OutputScriptType_SCRIPT_TYPE_MULTISIG
 	case txscript.NullDataTy:
-		ret = OutputScriptType_SCRIPT_TYPE_NULLDATA
+		return OutputScriptType_SCRIPT_TYPE_NULLDATA
 	case txscript.NonStandardTy:
-		ret = OutputScriptType_SCRIPT_TYPE_NON_STANDARD
+		return OutputScriptType_SCRIPT_TYPE_NON_STANDARD
 	case txscript.WitnessUnknownTy:
-		ret = OutputScriptType_SCRIPT_TYPE_WITNESS_UNKNOWN
+		return OutputScriptType_SCRIPT_TYPE_WITNESS_UNKNOWN
+	default:
+		return OutputScriptType_SCRIPT_TYPE_PUBKEY_HASH
 	}
-	return
 }

lnwallet/transactions_test.go

@@ -60,8 +60,8 @@ type testContext struct {
 
 // newTestContext populates a new testContext struct with the constant
 // parameters defined in the BOLT 03 spec.
-func newTestContext(t *testing.T) (tc *testContext) {
-	tc = new(testContext)
+func newTestContext(t *testing.T) *testContext {
+	tc := new(testContext)
 
 	priv := func(v string) *btcec.PrivateKey {
 		k, err := privkeyFromHex(v)

tools/go.mod

@@ -6,11 +6,8 @@ require (
 	github.com/btcsuite/btcd v0.23.1
 	github.com/dvyukov/go-fuzz v0.0.0-20210602112143-b1f3d6f4ef4e
 	github.com/elazarl/go-bindata-assetfs v1.0.1 // indirect
-	github.com/golangci/golangci-lint v1.44.0
+	github.com/golangci/golangci-lint v1.46.2
 	github.com/ory/go-acc v0.2.6
 	github.com/rinchsan/gosimports v0.1.5
 	github.com/stephens2424/writerset v1.0.2 // indirect
 )
-
-// Can be removed once this version is included in golangci-lint.
-replace github.com/ultraware/whitespace => github.com/ultraware/whitespace v0.0.5