multi: rename nolint:lll to nolint:ll

Find and replace all nolint instances refering to the `lll` linter and
replace with `ll` which is the name of our custom version of the `lll`
linter which can be used to ignore log lines during linting.

The next commit will do the configuration of the custom linter and
disable the default one.

lnwallet/btcwallet/btcwallet.go

@@ -1279,7 +1279,7 @@ func (b *BtcWallet) PublishTransaction(tx *wire.MsgTx, label string) error {
 	// btcwallet error.
 	err = b.chain.MapRPCErr(errors.New(result.RejectReason))
 
-	//nolint:lll
+	//nolint:ll
 	// These two errors are ignored inside `PublishTransaction`:
 	// https://github.com/btcsuite/btcwallet/blob/master/wallet/wallet.go#L3763
 	// To keep our current behavior, we need to ignore the same errors
@@ -1680,7 +1680,7 @@ out:
 
 			// Launch a goroutine to re-package and send
 			// notifications for any newly confirmed transactions.
-			//nolint:lll
+			//nolint:ll
 			go func(txNtfn *base.TransactionNotifications) {
 				for _, block := range txNtfn.AttachedBlocks {
 					details, err := minedTransactionsToDetails(

lnwallet/btcwallet/psbt_test.go

@@ -432,7 +432,7 @@ func TestEstimateInputWeight(t *testing.T) {
 				{},
 			},
 		},
-		//nolint:lll
+		//nolint:ll
 		expectedWitnessWeight: input.TaprootKeyPathCustomSighashWitnessSize,
 	}, {
 		name: "p2tr script spend",

lnwallet/chancloser/chancloser.go

@@ -917,7 +917,7 @@ func (c *ChanCloser) ReceiveClosingSigned( //nolint:funlen
 		)
 		matchingSig := c.priorFeeOffers[remoteProposedFee]
 		if c.cfg.Channel.ChanType().IsTaproot() {
-			localWireSig, err := matchingSig.PartialSig.UnwrapOrErrV( //nolint:lll
+			localWireSig, err := matchingSig.PartialSig.UnwrapOrErrV( //nolint:ll
 				fmt.Errorf("none local sig"),
 			)
 			if err != nil {
@@ -931,7 +931,7 @@ func (c *ChanCloser) ReceiveClosingSigned( //nolint:funlen
 			}
 
 			muSession := c.cfg.MusigSession
-			localSig, remoteSig, closeOpts, err = muSession.CombineClosingOpts( //nolint:lll
+			localSig, remoteSig, closeOpts, err = muSession.CombineClosingOpts( //nolint:ll
 				localWireSig, remoteWireSig,
 			)
 			if err != nil {
@@ -981,7 +981,7 @@ func (c *ChanCloser) ReceiveClosingSigned( //nolint:funlen
 		err = fn.MapOptionZ(
 			c.cfg.AuxCloser, func(aux AuxChanCloser) error {
 				channel := c.cfg.Channel
-				//nolint:lll
+				//nolint:ll
 				req := AuxShutdownReq{
 					ChanPoint:   c.chanPoint,
 					ShortChanID: c.cfg.Channel.ShortChanID(),

lnwallet/channel.go

@@ -2181,7 +2181,7 @@ func NewBreachRetribution(chanState *channeldb.OpenChannel, stateNum uint64,
 		// spend (as our output on their revoked tx still needs the
 		// delay), and set the control block.
 		if scriptTree, ok := ourScript.(input.TapscriptDescriptor); ok {
-			//nolint:lll
+			//nolint:ll
 			br.LocalOutputSignDesc.SignMethod = input.TaprootScriptSpendSignMethod
 
 			ctrlBlock, err := scriptTree.CtrlBlockForPath(
@@ -2191,7 +2191,7 @@ func NewBreachRetribution(chanState *channeldb.OpenChannel, stateNum uint64,
 				return nil, err
 			}
 
-			//nolint:lll
+			//nolint:ll
 			br.LocalOutputSignDesc.ControlBlock, err = ctrlBlock.ToBytes()
 			if err != nil {
 				return nil, err
@@ -2262,7 +2262,7 @@ func NewBreachRetribution(chanState *channeldb.OpenChannel, stateNum uint64,
 		// parties need to sweep anchors is revealed on chain.
 		scriptTree, ok := theirScript.(input.TapscriptDescriptor)
 		if ok {
-			//nolint:lll
+			//nolint:ll
 			br.RemoteOutputSignDesc.SignMethod = input.TaprootScriptSpendSignMethod
 
 			ctrlBlock, err := scriptTree.CtrlBlockForPath(
@@ -2271,7 +2271,7 @@ func NewBreachRetribution(chanState *channeldb.OpenChannel, stateNum uint64,
 			if err != nil {
 				return nil, err
 			}
-			//nolint:lll
+			//nolint:ll
 			br.RemoteOutputSignDesc.ControlBlock, err = ctrlBlock.ToBytes()
 			if err != nil {
 				return nil, err
@@ -3238,7 +3238,7 @@ func genRemoteHtlcSigJobs(keyRing *CommitmentKeyRing,
 		// If this is a taproot channel, then we'll need to set the
 		// method type to ensure we generate a valid signature.
 		if chanType.IsTaproot() {
-			//nolint:lll
+			//nolint:ll
 			sigJob.SignDesc.SignMethod = input.TaprootScriptSpendSignMethod
 		}
 
@@ -3320,7 +3320,7 @@ func genRemoteHtlcSigJobs(keyRing *CommitmentKeyRing,
 		// If this is a taproot channel, then we'll need to set the
 		// method type to ensure we generate a valid signature.
 		if chanType.IsTaproot() {
-			//nolint:lll
+			//nolint:ll
 			sigJob.SignDesc.SignMethod = input.TaprootScriptSpendSignMethod
 		}
 
@@ -4786,7 +4786,7 @@ func genHtlcSigValidationJobs(chanState *channeldb.OpenChannel,
 		// If this output index is found within the incoming HTLC
 		// index, then this means that we need to generate an HTLC
 		// success transaction in order to validate the signature.
-		//nolint:lll
+		//nolint:ll
 		case localCommitmentView.incomingHTLCIndex[outputIndex] != nil:
 			htlc = localCommitmentView.incomingHTLCIndex[outputIndex]
 
@@ -4825,7 +4825,7 @@ func genHtlcSigValidationJobs(chanState *channeldb.OpenChannel,
 				if chanType.IsTaproot() {
 					// TODO(roasbeef): add abstraction in
 					// front
-					prevFetcher := txscript.NewCannedPrevOutputFetcher( //nolint:lll
+					prevFetcher := txscript.NewCannedPrevOutputFetcher( //nolint:ll
 						htlc.ourPkScript, htlcAmt,
 					)
 					hashCache := txscript.NewTxSigHashes(
@@ -4835,7 +4835,7 @@ func genHtlcSigValidationJobs(chanState *channeldb.OpenChannel,
 						htlc.ourWitnessScript,
 					)
 
-					return txscript.CalcTapscriptSignaturehash( //nolint:lll
+					return txscript.CalcTapscriptSignaturehash( //nolint:ll
 						hashCache, sigHashType,
 						successTx, 0, prevFetcher,
 						tapLeaf,
@@ -4880,7 +4880,7 @@ func genHtlcSigValidationJobs(chanState *channeldb.OpenChannel,
 		// Otherwise, if this is an outgoing HTLC, then we'll need to
 		// generate a timeout transaction so we can verify the
 		// signature presented.
-		//nolint:lll
+		//nolint:ll
 		case localCommitmentView.outgoingHTLCIndex[outputIndex] != nil:
 			htlc = localCommitmentView.outgoingHTLCIndex[outputIndex]
 
@@ -4919,7 +4919,7 @@ func genHtlcSigValidationJobs(chanState *channeldb.OpenChannel,
 				if chanType.IsTaproot() {
 					// TODO(roasbeef): add abstraction in
 					// front
-					prevFetcher := txscript.NewCannedPrevOutputFetcher( //nolint:lll
+					prevFetcher := txscript.NewCannedPrevOutputFetcher( //nolint:ll
 						htlc.ourPkScript, htlcAmt,
 					)
 					hashCache := txscript.NewTxSigHashes(
@@ -4929,7 +4929,7 @@ func genHtlcSigValidationJobs(chanState *channeldb.OpenChannel,
 						htlc.ourWitnessScript,
 					)
 
-					return txscript.CalcTapscriptSignaturehash( //nolint:lll
+					return txscript.CalcTapscriptSignaturehash( //nolint:ll
 						hashCache, sigHashType,
 						timeoutTx, 0, prevFetcher,
 						tapLeaf,
@@ -5246,7 +5246,7 @@ func (lc *LightningChannel) ReceiveNewCommitment(commitSigs *CommitSigs) error {
 				_ = localCommitTx.Serialize(&txBytes)
 				return &InvalidPartialCommitSigError{
 					invalidPartialSigError: &sigErr,
-					InvalidCommitSigError: InvalidCommitSigError{ //nolint:lll
+					InvalidCommitSigError: InvalidCommitSigError{ //nolint:ll
 						commitHeight: nextHeight,
 						commitTx:     txBytes.Bytes(),
 					},
@@ -5302,7 +5302,7 @@ func (lc *LightningChannel) ReceiveNewCommitment(commitSigs *CommitSigs) error {
 
 			return &InvalidCommitSigError{
 				commitHeight: nextHeight,
-				commitSig:    commitSigs.CommitSig.ToSignatureBytes(), //nolint:lll
+				commitSig:    commitSigs.CommitSig.ToSignatureBytes(), //nolint:ll
 				sigHash:      sigHash,
 				commitTx:     txBytes.Bytes(),
 			}
@@ -5377,7 +5377,7 @@ func (lc *LightningChannel) ReceiveNewCommitment(commitSigs *CommitSigs) error {
 
 		localCommitmentView.sig = sigBytes[:]
 	} else {
-		localCommitmentView.sig = commitSigs.CommitSig.ToSignatureBytes() //nolint:lll
+		localCommitmentView.sig = commitSigs.CommitSig.ToSignatureBytes() //nolint:ll
 	}
 
 	lc.commitChains.Local.addCommitment(localCommitmentView)
@@ -6824,7 +6824,7 @@ func NewUnilateralCloseSummary(chanState *channeldb.OpenChannel, //nolint:funlen
 		// For taproot channels, we'll need to set some additional
 		// fields to ensure the output can be swept.
 		//
-		//nolint:lll
+		//nolint:ll
 		if scriptTree, ok := selfScript.(input.TapscriptDescriptor); ok {
 			commitResolution.SelfOutputSignDesc.SignMethod =
 				input.TaprootScriptSpendSignMethod
@@ -6835,7 +6835,7 @@ func NewUnilateralCloseSummary(chanState *channeldb.OpenChannel, //nolint:funlen
 			if err != nil {
 				return nil, err
 			}
-			//nolint:lll
+			//nolint:ll
 			commitResolution.SelfOutputSignDesc.ControlBlock, err = ctrlBlock.ToBytes()
 			if err != nil {
 				return nil, err
@@ -7269,7 +7269,7 @@ func newOutgoingHtlcResolution(signer input.Signer,
 			return nil, err
 		}
 	} else {
-		//nolint:lll
+		//nolint:ll
 		secondLevelScriptTree, err := input.TaprootSecondLevelScriptTree(
 			keyRing.RevocationKey, keyRing.ToLocalKey, csvDelay,
 			secondLevelAuxLeaf,
@@ -7336,9 +7336,9 @@ func newOutgoingHtlcResolution(signer input.Signer,
 				ChanType:       chanType,
 				ShortChanID:    chanState.ShortChanID(),
 				Initiator:      chanState.IsInitiator,
-				CommitBlob:     chanState.LocalCommitment.CustomBlob, //nolint:lll
+				CommitBlob:     chanState.LocalCommitment.CustomBlob, //nolint:ll
 				FundingBlob:    chanState.CustomBlob,
-				Type:           input.TaprootHtlcLocalOfferedTimeout, //nolint:lll
+				Type:           input.TaprootHtlcLocalOfferedTimeout, //nolint:ll
 				CloseType:      LocalForceClose,
 				CommitTx:       commitTx,
 				ContractPoint:  op,
@@ -7348,14 +7348,14 @@ func newOutgoingHtlcResolution(signer input.Signer,
 				HtlcAmt:        btcutil.Amount(txOut.Value),
 				CommitCsvDelay: csvDelay,
 				CltvDelay:      fn.Some(htlc.RefundTimeout),
-				CommitFee:      chanState.LocalCommitment.CommitFee, //nolint:lll
+				CommitFee:      chanState.LocalCommitment.CommitFee, //nolint:ll
 				HtlcID:         fn.Some(htlc.HtlcIndex),
 				PayHash:        fn.Some(htlc.RHash),
 				AuxSigDesc: fn.Some(AuxSigDesc{
 					SignDetails: *txSignDetails,
 					AuxSig: func() []byte {
-						tlvType := htlcCustomSigType.TypeVal()     //nolint:lll
-						return htlc.CustomRecords[uint64(tlvType)] //nolint:lll
+						tlvType := htlcCustomSigType.TypeVal()     //nolint:ll
+						return htlc.CustomRecords[uint64(tlvType)] //nolint:ll
 					}(),
 				}),
 			}
@@ -7451,7 +7451,7 @@ func newIncomingHtlcResolution(signer input.Signer,
 			PrevOutputFetcher: prevFetcher,
 		}
 
-		//nolint:lll
+		//nolint:ll
 		if scriptTree, ok := scriptInfo.(input.TapscriptDescriptor); ok {
 			signDesc.SignMethod = input.TaprootScriptSpendSignMethod
 			ctrlBlock, err := scriptTree.CtrlBlockForPath(
@@ -7612,7 +7612,7 @@ func newIncomingHtlcResolution(signer input.Signer,
 			return nil, err
 		}
 	} else {
-		//nolint:lll
+		//nolint:ll
 		secondLevelScriptTree, err := input.TaprootSecondLevelScriptTree(
 			keyRing.RevocationKey, keyRing.ToLocalKey, csvDelay,
 			secondLevelAuxLeaf,
@@ -7676,8 +7676,8 @@ func newIncomingHtlcResolution(signer input.Signer,
 				ChanType:      chanType,
 				ShortChanID:   chanState.ShortChanID(),
 				Initiator:     chanState.IsInitiator,
-				CommitBlob:    chanState.LocalCommitment.CustomBlob,  //nolint:lll
-				Type:          input.TaprootHtlcAcceptedLocalSuccess, //nolint:lll
+				CommitBlob:    chanState.LocalCommitment.CustomBlob,  //nolint:ll
+				Type:          input.TaprootHtlcAcceptedLocalSuccess, //nolint:ll
 				FundingBlob:   chanState.CustomBlob,
 				CloseType:     LocalForceClose,
 				CommitTx:      commitTx,
@@ -7686,13 +7686,13 @@ func newIncomingHtlcResolution(signer input.Signer,
 				KeyRing:       keyRing,
 				HtlcID:        fn.Some(htlc.HtlcIndex),
 				CsvDelay:      htlcCsvDelay,
-				CommitFee:     chanState.LocalCommitment.CommitFee, //nolint:lll
+				CommitFee:     chanState.LocalCommitment.CommitFee, //nolint:ll
 				PayHash:       fn.Some(htlc.RHash),
 				AuxSigDesc: fn.Some(AuxSigDesc{
 					SignDetails: *txSignDetails,
 					AuxSig: func() []byte {
-						tlvType := htlcCustomSigType.TypeVal()     //nolint:lll
-						return htlc.CustomRecords[uint64(tlvType)] //nolint:lll
+						tlvType := htlcCustomSigType.TypeVal()     //nolint:ll
+						return htlc.CustomRecords[uint64(tlvType)] //nolint:ll
 					}(),
 				}),
 				CommitCsvDelay: csvDelay,
@@ -8091,7 +8091,7 @@ func NewLocalForceCloseSummary(chanState *channeldb.OpenChannel,
 			if err != nil {
 				return nil, err
 			}
-			//nolint:lll
+			//nolint:ll
 			commitResolution.SelfOutputSignDesc.ControlBlock, err = ctrlBlock.ToBytes()
 			if err != nil {
 				return nil, err
@@ -8103,9 +8103,9 @@ func NewLocalForceCloseSummary(chanState *channeldb.OpenChannel,
 		resolveBlob := fn.MapOptionZ(
 			auxResolver,
 			func(a AuxContractResolver) fn.Result[tlv.Blob] {
-				//nolint:lll
+				//nolint:ll
 				return a.ResolveContract(ResolutionReq{
-					ChanPoint:     chanState.FundingOutpoint, //nolint:lll
+					ChanPoint:     chanState.FundingOutpoint, //nolint:ll
 					ChanType:      chanState.ChanType,
 					ShortChanID:   chanState.ShortChanID(),
 					Initiator:     chanState.IsInitiator,
@@ -8630,7 +8630,7 @@ func NewAnchorResolution(chanState *channeldb.OpenChannel,
 	if scriptTree, ok := localAnchor.(input.TapscriptDescriptor); ok {
 		signDesc.SignMethod = input.TaprootKeySpendSignMethod
 
-		//nolint:lll
+		//nolint:ll
 		signDesc.PrevOutputFetcher = txscript.NewCannedPrevOutputFetcher(
 			localAnchor.PkScript(), int64(AnchorSize),
 		)
@@ -8652,7 +8652,7 @@ func NewAnchorResolution(chanState *channeldb.OpenChannel,
 			// commitment, as this is a "tweakless" channel type,
 			// we don't need a tweak value at all.
 			//
-			//nolint:lll
+			//nolint:ll
 			signDesc.KeyDesc = chanState.LocalChanCfg.PaymentBasePoint
 		}
 
@@ -9072,7 +9072,7 @@ func (lc *LightningChannel) generateRevocation(height uint64) (*lnwire.RevokeAnd
 	// If this is a taproot channel, then we also need to generate the
 	// verification nonce for this target state.
 	if lc.channelState.ChanType.IsTaproot() {
-		nextVerificationNonce, err := channeldb.NewMusigVerificationNonce( //nolint:lll
+		nextVerificationNonce, err := channeldb.NewMusigVerificationNonce( //nolint:ll
 			lc.channelState.LocalChanCfg.MultiSigKey.PubKey,
 			revHeight, lc.taprootNonceProducer,
 		)

lnwallet/channel_test.go

@@ -9829,7 +9829,7 @@ func TestCreateBreachRetribution(t *testing.T) {
 		{
 			name: "fail due to our index too big",
 			revocationLog: &channeldb.RevocationLog{
-				//nolint:lll
+				//nolint:ll
 				OurOutputIndex: tlv.NewPrimitiveRecord[tlv.TlvType0](
 					uint16(htlcIndex + 1),
 				),
@@ -9839,7 +9839,7 @@ func TestCreateBreachRetribution(t *testing.T) {
 		{
 			name: "fail due to their index too big",
 			revocationLog: &channeldb.RevocationLog{
-				//nolint:lll
+				//nolint:ll
 				TheirOutputIndex: tlv.NewPrimitiveRecord[tlv.TlvType1](
 					uint16(htlcIndex + 1),
 				),
@@ -10352,7 +10352,7 @@ func TestApplyCommitmentFee(t *testing.T) {
 	for _, tc := range testCases {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
-			//nolint:lll
+			//nolint:ll
 			balance, bufferAmt, commitFee, err := tc.channel.applyCommitFee(
 				tc.balance, commitWeight, feePerKw, tc.buffer,
 			)
@@ -10832,7 +10832,7 @@ func TestBlindingPointPersistence(t *testing.T) {
 	// Send a HTLC from Alice to Bob that has a blinding point populated.
 	htlc, _ := createHTLC(0, 100_000_000)
 	blinding, err := pubkeyFromHex(
-		"0228f2af0abe322403480fb3ee172f7f1601e67d1da6cad40b54c4468d48236c39", //nolint:lll
+		"0228f2af0abe322403480fb3ee172f7f1601e67d1da6cad40b54c4468d48236c39", //nolint:ll
 	)
 	require.NoError(t, err)
 	htlc.BlindingPoint = tlv.SomeRecordT(

lnwallet/commitment.go

@@ -1258,7 +1258,7 @@ func addHTLC(commitTx *wire.MsgTx, whoseCommit lntypes.ChannelParty,
 	} else {
 		paymentDesc.theirPkScript = pkScript
 
-		//nolint:lll
+		//nolint:ll
 		paymentDesc.theirWitnessScript = scriptInfo.WitnessScriptToSign()
 	}
 

lnwallet/reservation.go

@@ -895,7 +895,7 @@ func (r *ChannelReservation) ChanState() *channeldb.OpenChannel {
 // CommitmentKeyRings returns the local+remote key ring used for the very first
 // commitment transaction both parties.
 //
-//nolint:lll
+//nolint:ll
 func (r *ChannelReservation) CommitmentKeyRings() lntypes.Dual[CommitmentKeyRing] {
 	r.RLock()
 	defer r.RUnlock()

lnwallet/wallet.go

@@ -2476,13 +2476,13 @@ func (l *LightningWallet) handleSingleFunderSigs(req *addSingleFunderSigsMsg) {
 		fundingTxOut         *wire.TxOut
 	)
 	if chanType.IsTaproot() {
-		//nolint:lll
+		//nolint:ll
 		fundingWitnessScript, fundingTxOut, err = input.GenTaprootFundingScript(
 			ourKey.PubKey, theirKey.PubKey, channelValue,
 			pendingReservation.partialState.TapscriptRoot,
 		)
 	} else {
-		//nolint:lll
+		//nolint:ll
 		fundingWitnessScript, fundingTxOut, err = input.GenFundingPkScript(
 			ourKey.PubKey.SerializeCompressed(),
 			theirKey.PubKey.SerializeCompressed(), channelValue,